Merge lp:~tintou/pantheon-photos/first-cmake into lp:~pantheon-photos/pantheon-photos/trunk

[Corentin Noël]

Ported to CMake. Removed very old retro-compatibility.

[lp:~tintou/pantheon-photos/first-cmake]

2881. By Corentin Noël on 2016-01-14

Reestablish Unity flag.

2882. By Corentin Noël on 2016-01-14

[Plugins] Use the right installation dir.

=== removed file '.doap'
--- .doap	2013-06-17 23:31:25 +0000
+++ .doap	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
- <name>Shotwell</name>
- <shortname>Shotwell</shortname>
- <shortdesc>Digital Photo Manager</shortdesc>
- <description>Shotwell is a digital photo manager designed for the GNOME desktop environment. It allows you to import photos from disk or camera, organize them in various ways, view them in full-window or fullscreen mode, and export and share them with others by publishing them to popular web services.
-
-Visit http://www.yorba.org/shotwell to read about the current state of Shotwell's development.</description>
- <homepage rdf:resource="http://www.yorba.org/projects/shotwell/" />
- <wiki rdf:resource="http://redmine.yorba.org/projects/shotwell/wiki" />
- <download-page rdf:resource="http://www.yorba.org/projects/shotwell/install/" />
- <bug-database rdf:resource="http://redmine.yorba.org/projects/shotwell/issues" />
- <programming-language>Vala</programming-language>
- <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
- <maintainer>
-  <foaf:Person>
-     <foaf:name>Jim Nelson</foaf:name>
-     <foaf:mbox_sha1sum>4cf80db74d6388f6e8f0c4509dcc696ca5abb8d1</foaf:mbox_sha1sum>
-  </foaf:Person>
- </maintainer>
- 
-</Project>

=== removed file '.gitignore'
--- .gitignore	2013-04-25 19:54:33 +0000
+++ .gitignore	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-shotwell
-.valencia
-/build
-/configure.mk
-/misc/gschemas.compiled
-/misc/shotwell.desktop
-/misc/shotwell-viewer.desktop
-/plugins/shotwell-plugin-dev-1.0.vapi
-/plugins/shotwell-plugin-dev-1.0.deps
-/src/libshotwell.vapi
-/src/.unitize
-/thumbnailer/shotwell-video-thumbnailer
-/src/libshotwell.deps
-*.c
-*.h
-*.langstamp
-*.mo
-*.o
-*.pc
-*.so
-*.stamp
-*~
-

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2016-01-14 14:02:26 +0000
@@ -0,0 +1,111 @@
+project (pantheon-photos)
+
+cmake_minimum_required (VERSION 2.8)
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+include (GNUInstallDirs)
+set (DATADIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
+set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
+set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+set (EXEC_NAME ${CMAKE_PROJECT_NAME})
+set (APP_NAME "Photos")
+set (VERSION "0.1")
+set (VERSION_INFO "Alpha")
+set (DOLLAR "$")
+
+option (BUILD_PLUGINS "Whether to build plugins or not." ON)
+
+add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+add_definitions (-w)
+
+set (DEPS_PKG
+    gee-0.8>=0.8.5
+    gexiv2>=0.4.90
+    gio-unix-2.0>=2.20
+    glib-2.0>=2.30.0
+    gmodule-2.0>=2.24.0
+    gstreamer-1.0>=1.0.0
+    gstreamer-base-1.0>=1.0.0
+    gstreamer-plugins-base-1.0>=1.0.0
+    gstreamer-pbutils-1.0>=1.0.0
+    granite
+    gtk+-3.0>=3.6.0
+    gudev-1.0>=145
+    json-glib-1.0
+    libexif>=0.6.16
+    libgphoto2>=2.4.2
+    libraw>=0.13.2
+    libsoup-2.4>=2.26.0
+    libxml-2.0>=2.6.32
+    rest-0.7>=0.7
+    sqlite3>=3.5.9
+    webkit2gtk-4.0>=2.0.0
+)
+
+set (DEPS_PACKAGES
+    atk
+    gdk-3.0
+    gee-0.8
+    gexiv2
+    gio-unix-2.0
+    glib-2.0
+    gmodule-2.0
+    granite
+    gstreamer-1.0
+    gstreamer-base-1.0
+    gstreamer-pbutils-1.0
+    gtk+-3.0
+    gudev-1.0
+    libexif
+    libgphoto2
+    json-glib-1.0
+    libraw
+    libsoup-2.4
+    libxml-2.0
+    sqlite3
+    webkit2gtk-4.0
+    # Custom .vapis
+    ExtendedPosix
+    LConv
+    unique-3.0
+)
+
+set (GLOBAL_VALA_OPTIONS
+    --vapidir=${CMAKE_SOURCE_DIR}/vapi
+    --vapidir=${CMAKE_BINARY_DIR}/src
+    --target-glib=2.32
+    --thread
+    # Remove it when vala bindings are no more experimental (see https://bugzilla.gnome.org/show_bug.cgi?id=719597)
+    --enable-experimental
+)
+
+find_package (PkgConfig)
+pkg_check_modules (DEPS REQUIRED ${DEPS_PKG})
+pkg_check_modules (UNITY QUIET unity)
+if (UNITY_FOUND)
+    message("-- Unity support enabled")
+    set (DEPS_CFLAGS ${DEPS_CFLAGS} ${UNITY_CFLAGS})
+    set (DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${UNITY_LIBRARY_DIRS})
+    set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${UNITY_LIBRARIES})
+    set (DEPS_PACKAGES ${DEPS_PACKAGES} unity)
+    set (GLOBAL_VALA_OPTIONS ${GLOBAL_VALA_OPTIONS} --define UNITY_SUPPORT)
+else ()
+    message("-- Unity support disabled")
+endif ()
+
+add_definitions (${DEPS_CFLAGS})
+link_directories (${DEPS_LIBRARY_DIRS})
+
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.26" MINIMUM)
+
+include (ValaPrecompile)
+
+add_subdirectory (po)
+add_subdirectory (data)
+add_subdirectory (schemas)
+add_subdirectory (src)
+add_subdirectory (thumbnailer)
+add_subdirectory (plugins)
+

=== removed file 'Makefile'
--- Makefile	2016-01-11 22:03:46 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,697 +0,0 @@
-PROGRAM = pantheon-photos
-PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
-PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
-
-VERSION = 0.1.1
-GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
-GETTEXT_PACKAGE = $(PROGRAM)
-BUILD_ROOT = 1
-
-ifndef VALAC
-VALAC := $(shell which valac)
-else
-VALAC := $(shell which $(VALAC))
-endif
-
-VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
-MIN_VALAC_VERSION := 0.20.1
-INSTALL_PROGRAM := install
-INSTALL_DATA := install -m 644
-
-export MIN_GLIB_VERSION=2.30.0
-
-# defaults that may be overridden by configure.mk
-PREFIX=/usr/local
-BUILD_RELEASE=1
-LIB=lib
-
--include configure.mk
-ifndef LIBEXECDIR
-LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
-endif
-
-CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
-
-LOCAL_LANG_DIR=locale-langpack
-SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-
-VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS)
-ifdef UNITY_SUPPORT
-VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
-endif
-
-DEFINES := _PREFIX='"$(PREFIX)"' _VERSION='"$(VERSION)"' GETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-	_LANG_SUPPORT_DIR='"$(SYSTEM_LANG_DIR)"' _LIB='"${LIB}"' _LIBEXECDIR='"$(LIBEXECDIR)"'
-
-ifdef GITVER
-DEFINES := $(DEFINES) _GIT_VERSION='"$(GITVER)"'
-VALAFLAGS := $(VALAFLAGS) --define=_GITVERSION
-endif
-
-EXPORT_FLAGS = -export-dynamic
-
-include units.mk
-include plugins/plugins.mk
-
-UNUNITIZED_SRC_FILES = \
-	main.vala \
-	AppWindow.vala \
-	CollectionPage.vala \
-	Thumbnail.vala \
-	ThumbnailCache.vala \
-	CheckerboardLayout.vala \
-	PhotoPage.vala \
-	Page.vala \
-	SortedList.vala \
-	Dimensions.vala \
-	Box.vala \
-	Photo.vala \
-	Orientation.vala \
-	BatchImport.vala \
-	Dialogs.vala \
-	Resources.vala \
-	Debug.vala \
-	ColorTransformation.vala \
-	CustomComponents.vala \
-	Event.vala \
-	International.vala \
-	AppDirs.vala \
-	PixbufCache.vala \
-	CommandManager.vala \
-	Commands.vala \
-	SlideshowPage.vala \
-	LibraryFiles.vala \
-	Printing.vala \
-	Tag.vala \
-	Screensaver.vala \
-	Exporter.vala \
-	DirectoryMonitor.vala \
-	LibraryMonitor.vala \
-	VideoSupport.vala \
-	Tombstone.vala \
-	MetadataWriter.vala \
-	Application.vala \
-	TimedQueue.vala \
-	MediaPage.vala \
-	MediaDataRepresentation.vala \
-	DesktopIntegration.vala \
-	MediaInterfaces.vala \
-	MediaMetadata.vala \
-	VideoMetadata.vala \
-	MediaMonitor.vala \
-	PhotoMonitor.vala \
-	VideoMonitor.vala \
-	SearchFilter.vala \
-	MediaViewTracker.vala \
-	UnityProgressBar.vala \
-	Upgrades.vala 
-
-THUMBNAILER_SRC_FILES = \
-	shotwell-video-thumbnailer.vala
-
-VAPI_FILES = \
-	ExtendedPosix.vapi \
-	LConv.vapi \
-	libexif.vapi \
-	libraw.vapi \
-	webkitgtk-3.0.vapi \
-	unique-3.0.vapi
-
-DEPS_FILES = \
-	webkitgtk-3.0.deps \
-	unique-3.0.deps
-
-RESOURCE_FILES = \
-	collection.ui \
-	direct.ui \
-	direct_context.ui \
-	events_directory.ui \
-	event.ui \
-	import_queue.ui \
-	import.ui \
-	media.ui \
-	offline.ui \
-	photo.ui \
-	photo_context.ui \
-	savedsearch.ui \
-	search_sidebar_context.ui \
-	set_background_dialog.glade \
-	shotwell.glade \
-	shotwell.xml \
-	sidebar_default_context.ui \
-	tag_sidebar_context.ui \
-	tags.ui \
-	top.ui \
-	trash.ui 
-
-SYS_INTEGRATION_FILES = \
-	pantheon-photos.appdata.xml \
-	pantheon-photos.desktop.head \
-	pantheon-photos.desktop.tail \
-	pantheon-photos-viewer.desktop.head \
-	pantheon-photos-viewer.desktop.tail \
-	org.pantheon.photos.gschema.xml \
-	org.pantheon.photos-extras.gschema.xml \
-	pantheon-photos.convert
-
-SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
-
-SRC_HEADER_FILES = \
-	gphoto.h
-
-TEXT_FILES = \
-	AUTHORS \
-	COPYING \
-	INSTALL \
-	MAINTAINERS \
-	NEWS \
-	README \
-	THANKS
-
-ICON_FILES = \
-	drag_nub.png \
-	noninterpretable-video.png \
-	pin-toolbar.svg \
-	sprocket.png
-
-HELP_FILES = \
-	edit-adjustments.page \
-	edit-crop.page \
-	edit-enhance.page \
-	edit-external.page \
-	edit-nondestructive.page \
-	edit-redeye.page \
-	edit-rotate.page \
-	edit-straighten.page \
-	edit-time-date.page \
-	edit-undo.page \
-	formats.page \
-	import-camera.page \
-	import-file.page \
-	import-f-spot.page \
-	import-memorycard.page \
-	index.page \
-	organize-event.page \
-	organize-flag.page \
-	organize-rating.page \
-	organize-remove.page \
-	organize-search.page \
-	organize-tag.page \
-	organize-title.page \
-	other-files.page \
-	other-missing.page \
-	other-multiple.page \
-	other-plugins.page \
-	raw.page \
-	running.page \
-	share-background.page \
-	share-export.page \
-	share-print.page \
-	share-send.page \
-	share-slideshow.page \
-	share-upload.page \
-	view-displaying.page \
-	view-information.page \
-	view-sidebar.page
-
-HELP_IMAGES = \
-	crop_thirds.jpg \
-	editing_overview.png \
-	edit_toolbar.png \
-	shotwell_logo.png \
-	trash_process.png
-
-VAPI_DIRS = \
-	./vapi
-
-HEADER_DIRS = \
-	./vapi
-
-LOCAL_PKGS = \
-	ExtendedPosix \
-	posix \
-	LConv
-
-EXT_PKGS = \
-	atk \
-	gdk-3.0 \
-	gee-0.8 \
-	gexiv2 \
-	gio-unix-2.0 \
-	glib-2.0 \
-	gmodule-2.0 \
-	granite \
-	gstreamer-1.0 \
-	gstreamer-base-1.0 \
-	gstreamer-pbutils-1.0 \
-	gtk+-3.0 \
-	gudev-1.0 \
-	libexif \
-	libgphoto2 \
-	json-glib-1.0 \
-	libraw \
-	libsoup-2.4 \
-	libxml-2.0 \
-	sqlite3 \
-	webkitgtk-3.0
-	
-ifdef UNITY_SUPPORT
-EXT_PKGS += unity
-endif
-
-THUMBNAILER_PKGS = \
-    gtk+-3.0 \
-    gee-0.8 \
-    gstreamer-1.0 \
-    gstreamer-base-1.0
-
-DIRECT_LIBS =
-
-EXT_PKG_VERSIONS = \
-	gee-0.8 >= 0.8.5 \
-	gexiv2 >= 0.4.90 \
-	gio-unix-2.0 >= 2.20 \
-	glib-2.0 >= $(MIN_GLIB_VERSION) \
-	gmodule-2.0 >= 2.24.0 \
-	gstreamer-1.0 >= 1.0.0 \
-	gstreamer-base-1.0 >= 1.0.0 \
-	gstreamer-plugins-base-1.0 >= 1.0.0 \
-	gstreamer-pbutils-1.0 >= 1.0.0 \
-	gtk+-3.0 >= 3.6.0 \
-	gudev-1.0 >= 145 \
-	libexif >= 0.6.16 \
-	libgphoto2 >= 2.4.2 \
-	libraw >= 0.13.2 \
-	libsoup-2.4 >= 2.26.0 \
-	libxml-2.0 >= 2.6.32 \
-	rest-0.7 >= 0.7 \
-	sqlite3 >= 3.5.9 \
-	webkitgtk-3.0 >= 1.4.0 
-
-DIRECT_LIBS_VERSIONS =
-
-VALA_PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
-
-ifndef BUILD_DIR
-BUILD_DIR=src
-endif
-
-DESKTOP_APP_SHORT_NAME="Photos"
-DESKTOP_APP_FULL_NAME="Photo Manager"
-DESKTOP_APPLICATION_COMMENT="Organize your photos"
-DESKTOP_APPLICATION_CLASS="Photo Manager"
-DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
-DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photo Viewer"
-DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Photo Viewer"
-DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
-TEMPORARY_DESKTOP_FILES = misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
-
-# Process the units
-UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
-include $(UNIT_MKS)
-
-UNITIZE_DIR := src/.unitize
-UNITIZE_ENTRIES := $(foreach unit,$(APP_UNITS),$(UNITIZE_DIR)/_$(unit)_unitize_entry.vala)
-UNITIZE_INITS := $(foreach nm,$(UNIT_NAMESPACES),$(UNITIZE_DIR)/_$(nm)Internals.vala)
-UNITIZE_STAMP := $(UNITIZE_DIR)/.unitized
-
-PLUGINS_DIR := plugins
-PLUGINS_SO := $(foreach plugin,$(PLUGINS),$(PLUGINS_DIR)/$(plugin)/$(plugin).so)
-EXTRA_PLUGINS_SO := $(foreach plugin,$(EXTRA_PLUGINS),$(PLUGINS_DIR)/$(plugin)/$(plugin).so)
-PLUGINS_DIST_FILES := `$(MAKE) --directory=plugins --no-print-directory listfiles`
-
-THUMBNAILER_DIR := thumbnailer
-THUMBNAILER_BIN := $(THUMBNAILER_DIR)/$(PROGRAM_THUMBNAILER)
-EXPANDED_THUMBNAILER_SRC_FILES := $(foreach file, $(THUMBNAILER_SRC_FILES), $(THUMBNAILER_DIR)/$(file))
-
-MIGRATOR_DIR := settings-migrator
-MIGRATOR_BIN := $(MIGRATOR_DIR)/$(PROGRAM_MIGRATOR)
-
-EXPANDED_CORE_PO_FILES := $(foreach po,$(CORE_SUPPORTED_LANGUAGES),po/$(po).po)
-
-EXPANDED_SRC_FILES := $(UNITIZED_SRC_FILES) $(foreach src,$(UNUNITIZED_SRC_FILES),src/$(src)) \
-	$(UNITIZE_INITS) $(UNITIZE_ENTRIES)
-EXPANDED_DIST_SRC_FILES := $(UNITIZED_SRC_FILES) $(foreach src,$(UNUNITIZED_SRC_FILES),src/$(src))
-EXPANDED_C_FILES := $(foreach file,$(subst src,$(BUILD_DIR),$(EXPANDED_SRC_FILES)),$(file:.vala=.c))
-EXPANDED_OBJ_FILES := $(foreach file,$(subst src,$(BUILD_DIR),$(EXPANDED_SRC_FILES)),$(file:.vala=.o))
-EXPANDED_SYS_INTEGRATION_FILES := $(foreach file,$(SYS_INTEGRATION_FILES),misc/$(file))
-EXPANDED_ICON_FILES := $(foreach file,$(ICON_FILES),icons/$(file))
-EXPANDED_VAPI_FILES := $(foreach vapi,$(VAPI_FILES),vapi/$(vapi))
-EXPANDED_DEPS_FILES := $(foreach deps,$(DEPS_FILES),vapi/$(deps))
-EXPANDED_SRC_HEADER_FILES := $(foreach header,$(SRC_HEADER_FILES),vapi/$(header))
-EXPANDED_RESOURCE_FILES := $(foreach res,$(RESOURCE_FILES),ui/$(res))
-EXPANDED_HELP_FILES := $(foreach file,$(HELP_FILES),help/C/$(file))
-EXPANDED_HELP_IMAGES := $(foreach file,$(HELP_IMAGES),help/C/figures/$(file))
-VALA_STAMP := $(BUILD_DIR)/.stamp
-LANG_STAMP := $(LOCAL_LANG_DIR)/.langstamp
-MAKE_FILES := Makefile $(CONFIG_IN) $(UNIT_MKS) unitize.mk units.mk
-PC_INPUT := shotwell-plugin-dev-1.0.m4
-PC_FILE := $(PC_INPUT:.m4=.pc)
-
-DIST_FILES = Makefile configure chkver $(EXPANDED_DIST_SRC_FILES) $(EXPANDED_VAPI_FILES) \
-	$(EXPANDED_DEPS_FILES) $(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) \
-	$(EXPANDED_ICON_FILES) $(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_CORE_PO_FILES) \
-	po/LINGUAS po/POTFILES.in po/POTFILES.skip \
-	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
-	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
-	vapi/libgphoto2.vapi \
-	$(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN)
-
-DIST_TAR = $(PROGRAM)-$(VERSION).tar
-DIST_TAR_XZ = $(DIST_TAR).xz
-PACKAGE_ORIG_XZ = $(PROGRAM)_`parsechangelog | grep Version | sed 's/.*: //'`.orig.tar.xz
-
-VALAFLAGS := $(VALAFLAGS) $(VALA_DEFINES) --vapidir=plugins/
-
-VALA_CFLAGS := `pkg-config --cflags $(EXT_PKGS) $(DIRECT_LIBS) gthread-2.0` \
-	$(foreach hdir,$(HEADER_DIRS),-I$(hdir)) \
-	$(foreach def,$(DEFINES),-D$(def))
-
-VALA_LDFLAGS := `pkg-config --libs $(EXT_PKGS) $(DIRECT_LIBS) gthread-2.0`
-
-# REQUIRED_CFLAGS absolutely get appended to CFLAGS, whatever the
-# the value of CFLAGS in the environment
-REQUIRED_CFLAGS := -fPIC
-
-# setting CFLAGS in configure.mk overrides build type
-ifndef CFLAGS
-ifdef BUILD_DEBUG
-CFLAGS = -O0 -g -pipe
-PLUGIN_CFLAGS = -O0 -g -pipe
-else
-CFLAGS = -O2 -g -pipe
-PLUGIN_CFLAGS = -O2 -g -pipe
-endif
-endif
-
-CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS)
-PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS)
-
-# Required for gudev-1.0
-CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
-
-all: pkgcheck valacheck desktop
-
-ifdef ENABLE_BUILD_FOR_GLADE
-all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
-else
-all: $(PLUGINS_DIR) $(PROGRAM) $(PC_FILE)
-endif
-
-
-include src/plugins/mk/interfaces.mk
-
-$(LANG_STAMP): $(EXPANDED_CORE_PO_FILES)
-	@$(foreach po,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
-		msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/$(po).po`)
-	@touch $(LANG_STAMP)
-
-clean:
-	rm -f $(EXPANDED_C_FILES)
-	rm -f $(EXPANDED_OBJ_FILES)
-	rm -f $(VALA_STAMP)
-	rm -rf $(PROGRAM)-$(VERSION)
-	rm -f $(PROGRAM)
-	rm -f $(THUMBNAILER_DIR)/$(PROGRAM_THUMBNAILER)
-	rm -rf $(LOCAL_LANG_DIR)
-	rm -f $(LANG_STAMP)
-	rm -f $(TEMPORARY_DESKTOP_FILES)
-	rm -f lib$(PROGRAM).so
-	rm -rf $(UNITIZE_DIR)
-	rm -f $(PLUGIN_VAPI)
-	rm -f $(PLUGIN_HEADER)
-	rm -f $(PLUGIN_DEPS)
-	rm -f $(PLUGINS_SO)
-	rm -f $(EXTRA_PLUGINS_SO)
-	@$(MAKE) --directory=plugins clean
-	rm -f $(PC_FILE)
-
-cleantemps:
-	rm -f $(EXPANDED_C_FILES)
-	rm -f $(EXPANDED_OBJ_FILES)
-	rm -f $(VALA_STAMP)
-	rm -f $(LANG_STAMP)
-	rm -f $(TEMPORARY_DESKTOP_FILES)
-	@$(MAKE) --directory=plugins cleantemps
-	rm -f misc/gschemas.compiled
-
-package:
-	$(MAKE) dist
-	cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
-	rm -f $(DIST_TAR_XZ)
-
-misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop.tail $(EXPANDED_CORE_PO_FILES)
-	cp misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop
-	@ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
-		>> misc/pantheon-photos.desktop ; \
-		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
-		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
-		echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
-		echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;) 
-	cat misc/pantheon-photos.desktop.tail >> misc/pantheon-photos.desktop
-ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/pantheon-photos.desktop 1>misc/pantheon-photos.desktop.errors 2>&1; \
-	if test -s misc/pantheon-photos.desktop.errors; then \
-		echo -e "\nThe file misc/pantheon-photos.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos.desktop.errors for details."; \
-		exit 1; \
-	else rm -f misc/pantheon-photos.desktop.errors; \
-	fi
-endif
-	
-misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop.tail $(EXPANDED_CORE_PO_FILES)
-	cp misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop
-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/pantheon-photos-viewer.desktop ; \
-		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
-	cat misc/pantheon-photos-viewer.desktop.tail >> misc/pantheon-photos-viewer.desktop
-ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/pantheon-photos-viewer.desktop 1>misc/pantheon-photos-viewer.desktop.errors 2>&1; \
-	if test -s misc/pantheon-photos-viewer.desktop.errors; then \
-		echo -e S"\nThe file misc/pantheon-photos-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos-viewer.desktop.errors for details."; \
-		exit 1; \
-	else rm -f misc/pantheon-photos-viewer.desktop.errors; \
-	fi
-endif
-
-.PHONY: desktop
-desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
-
-.PHONY: dist
-dist:
-	mkdir -p $(PROGRAM)-$(VERSION)
-	cp --parents --preserve $(DIST_FILES) $(PROGRAM)-$(VERSION)
-	tar --xz -cvf $(DIST_TAR_XZ) $(PROGRAM)-$(VERSION)
-	rm -rf $(PROGRAM)-$(VERSION)
-
-distclean: clean
-	rm -f configure.mk
-	rm -f $(DIST_TAR_XZ)
-	@$(MAKE) --directory=plugins distclean
-
-.PHONY: install
-install:
-	touch $(LANG_STAMP)
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(LIBEXECDIR)
-	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
-	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
-	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
-	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
-	$(INSTALL_DATA) icons/pin-toolbar.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
-	mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.pantheon.photos.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.pantheon.photos-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-ifndef DISABLE_SCHEMAS_COMPILE
-	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-endif
-ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
-	mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
-	$(INSTALL_DATA) misc/pantheon-photos.convert $(DESTDIR)/usr/share/GConf/gsettings
-endif
-ifndef DISABLE_ICON_UPDATE
-	-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
-endif
-	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
-	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
-	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-	mkdir -p $(DESTDIR)$(PREFIX)/share/appdata
-	$(INSTALL_DATA) misc/pantheon-photos.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/pantheon-photos-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/pantheon-photos.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
-ifndef DISABLE_DESKTOP_UPDATE
-	-update-desktop-database || :
-endif
-ifdef ENABLE_APPORT_HOOK_INSTALL
-	mkdir -p $(DESTDIR)$(PREFIX)/share/apport/package-hooks
-	$(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
-endif
-ifndef DISABLE_HELP_INSTALL
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
-	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
-	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
-endif
-	-$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
-		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
-		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-ifdef PLUGINS_RC
-	$(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-endif
-ifndef DISABLE_EXTRA_PLUGINS_INSTALL
-	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-ifdef EXTRA_PLUGINS_RC
-	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-endif
-endif
-ifdef INSTALL_HEADERS
-	mkdir -p $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
-	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
-	mkdir -p $(DESTDIR)$(PREFIX)/share/vala/vapi
-	$(INSTALL_DATA) $(PLUGIN_VAPI) $(DESTDIR)$(PREFIX)/share/vala/vapi
-	$(INSTALL_DATA) $(PLUGIN_DEPS) $(DESTDIR)$(PREFIX)/share/vala/vapi
-	test -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig || mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-	$(INSTALL_DATA) $(PC_FILE) $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-endif
-
-# Old versions of Makefile installed util binaries to $(PREFIX)/bin, so uninstall from there for now
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
-	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_THUMBNAILER)
-	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
-	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
-	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
-	rm -fr $(DESTDIR)$(PREFIX)/share/pantheon-photos
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/pantheon-photos.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos-viewer.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/appdata/pantheon-photos.appdata.xml
-ifndef DISABLE_DESKTOP_UPDATE
-	-update-desktop-database || :
-endif
-ifndef DISABLE_HELP_INSTALL
-	rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos
-endif
-ifdef ENABLE_APPORT_HOOK_INSTALL
-	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py
-endif
-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
-	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
-ifdef INSTALL_HEADERS
-	rm -rf $(DESTDIR)$(PREFIX)/include/pantheon-photos
-	rm -f $(foreach vapi,$(PLUGIN_VAPI),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(vapi)))
-	rm -f $(foreach dep,$(PLUGIN_DEPS),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(dep)))
-	rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PC_FILE)
-endif
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos.gschema.xml
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.pantheon.photos-extras.gschema.xml
-ifndef DISABLE_SCHEMAS_COMPILE
-	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-endif
-ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
-	rm -f $(DESTDIR)/usr/share/GConf/gsettings/pantheon-photos.convert
-endif
-
-$(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
-	m4 '-D_VERSION_=$(VERSION)' '-D_PREFIX_=$(PREFIX)' '-D_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \
-		'-D_LIB_=$(LIB)' $< > $@
-
-$(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4
-	@mkdir -p $(UNITIZE_DIR)
-	@$(foreach unit,$(APP_UNITS),\
-		`m4 '-D_APP_UNIT_=$(unit)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(unit)_unitize_entry.vala`)
-	@$(foreach nm,$(UNIT_NAMESPACES),\
-		`m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`)
-	@touch $@
-
-$(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP)
-	@
-
-# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
-$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
-	$(call check_valac_version)
-	@echo Compiling Vala code...
-	@mkdir -p $(BUILD_DIR)
-	$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
-		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
-		$(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
-		$(VALAFLAGS) \
-		$(EXPANDED_SRC_FILES)
-	@touch $@
-
-# Do not remove hard tab or at symbol; necessary for dependencies to complete.
-$(EXPANDED_C_FILES): $(VALA_STAMP)
-	@
-
-$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
-	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
-
-$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled
-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
-
-misc/gschemas.compiled: $(SCHEMA_FILES)
-	rm -f misc/gschemas.compiled
-	glib-compile-schemas misc
-
-$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
-	$(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg))
-
-$(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR)
-	@
-
-.PHONY: $(PLUGINS_DIR)
-$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
-	$(call check_valac_version)
-	@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
-		PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
-
-.PHONY: docs
-docs:
-# valadoc complains if the directory already exists
-	@rm -rf docs
-	valadoc --directory=docs --package-name=pantheon-photos-plugin-dev --package-version=$(VERSION) --verbose \
-		--no-protected \
-		$(foreach def,$(DEFINES),--define=$(def)) \
-		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
-		$(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
-		$(PLUGIN_INTERFACES)
-
-glade: lib$(PROGRAM).so
-
-lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
-
-.PHONY: pkgcheck
-pkgcheck:
-	@if ! test -f configure.mk; then echo "Please run ./configure first."; exit 2; fi 
-
-.PHONY: valacheck
-valacheck:
-	@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  No valac found in path or $$VALAC.'; exit 1 )
-	@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 )
-	$(if $(MAX_VALAC_VERSION),\
-		@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
-
-
-
-ifndef ASSUME_PKGS
-ifdef EXT_PKG_VERSIONS
-	@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)'
-endif
-ifdef EXT_PKGS
-	@pkg-config --print-errors --exists $(EXT_PKGS) $(DIRECT_LIBS_VERSIONS)
-endif
-endif
-	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
-ifndef DISABLE_DESKTOP_VALIDATE
-	@ type desktop-file-validate > /dev/null || ( echo 'desktop-file-validate (usually found in the desktop-file-utils package) is missing and is required to build Shotwell. ' ; exit 1 )
-endif

=== removed directory 'apport'
=== removed file 'apport/shotwell.py'
--- apport/shotwell.py	2010-06-09 17:39:28 +0000
+++ apport/shotwell.py	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-import os.path
-import apport.hookutils
-
-def add_info(report):
-    log_file = os.path.expanduser('~/.cache/shotwell/shotwell.log')
-    apport.hookutils.attach_file_if_exists(report, log_file, 'shotwell.log')
-

=== removed file 'chkver'
--- chkver	2013-01-21 21:16:09 +0000
+++ chkver	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-#! /bin/bash
-#
-# Copyright 2009-2013 Yorba Foundation
-#
-# This software is licensed under the GNU LGPL (version 2.1 or later).
-# See the COPYING file in this distribution.
-#
-# chkver <min | max> <major.minor.revision> <min|max major.minor.revision>
-#
-# Returns 0 if queried version is greater than or equal (for min) or lesser than (for max) the
-# supplied value, or 1 otherwise.
-#
-# Set VERBOSE environment variable for somewhat useful output.
-#
-# NOTE:
-# This is an ultra-naive implementation with just enough error-checking.
-
-usage() {
-    echo 'usage: chkver <min | max> <major.minor.revision> <min|max major.minor.revision>'
-}
-
-abort() {
-    usage
-    exit 1
-}
-
-verify_cardinal() {
-    while [ $# != 0 ]
-    do
-        if [ $1 ] && [ $1 -eq $1 2> /dev/null ] && [ $1 -ge 0 ]
-        then
-            :
-        else
-            abort
-        fi
-        
-        shift
-    done
-}
-
-# check_min name number min-number
-check_min() {
-    if [ $2 -gt $3 ]
-    then
-        verbose $1 large enough.
-        exit 0
-    elif [ $2 -lt $3 ]
-    then
-        verbose $1 not large enough.
-        exit 1
-    fi
-}
-
-# check_max name number max-number
-check_max() {
-    if [ $2 -lt $3 ]
-    then
-        verbose $1 small enough.
-        exit 0
-    elif [ $2 -gt $3 ]
-    then
-        verbose $1 not small enough.
-        exit 1
-    fi
-}
-
-verbose() {
-    if [ $VERBOSE ]
-    then
-        echo $*
-    fi
-}
-
-# Check number of arguments
-if [ $# -lt 3 ]
-then
-    abort
-fi
-
-# Parse arguments
-mode=$1
-if [ $mode != "min" ] && [ $mode != "max" ]
-then
-    abort
-fi
-
-major=`echo $2 | awk -F. '{print $1}'`
-minor=`echo $2 | awk -F. '{print $2}'`
-revision=`echo $2 | awk -F. '{print $3}'`
-
-min_major=`echo $3 | awk -F. '{print $1}'`
-min_minor=`echo $3 | awk -F. '{print $2}'`
-min_revision=`echo $3 | awk -F. '{print $3}'`
-
-# Verify they're all positive integers
-verify_cardinal "$major" "$minor" "$revision" "$min_major" "$min_minor" "$min_revision"
-
-verbose Comparing $major.$minor.$revision against $mode $min_major.$min_minor.$min_revision
-
-# check version numbers in order of importance
-if [ $mode == "min" ]
-then
-    check_min "Major" $major $min_major
-    check_min "Minor" $minor $min_minor
-    check_min "Revision" $revision $min_revision
-else
-    check_max "Major" $major $min_major
-    check_max "Minor" $minor $min_minor
-    check_max "Revision" $revision $min_revision
-fi
-
-verbose Same version.
-if [ $mode == "min" ]
-then
-    exit 0
-else
-    exit 1
-fi
-

=== added directory 'cmake'
=== added file 'cmake/FindGirCompiler.cmake'
--- cmake/FindGirCompiler.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGirCompiler.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,56 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+##
+# Find module for the Gir compiler (g-ir-compiler)
+#
+# This module determines wheter a Gir compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  G_IR_COMPILER_FOUND       Whether the g-ir-compiler compiler has been found or not
+#  G_IR_COMPILER_EXECUTABLE  Full path to the g-ir-compiler executable if it has been found
+##
+
+
+# Search for the g-ir-compiler executable in the usual system paths.
+find_program (G_IR_COMPILER_EXECUTABLE
+  NAMES g-ir-compiler)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka.
+# G_IR_COMPILER_EXECUTABLE is set)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE)
+
+mark_as_advanced (G_IR_COMPILER_EXECUTABLE)

=== added file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindVala.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,65 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+##
+# Find module for the Vala compiler (valac)
+#
+# This module determines wheter a Vala compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(Vala) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  VALA_FOUND       Whether the vala compiler has been found or not
+#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
+#  VALA_VERSION     Version number of the available valac
+##
+
+
+# Search for the valac executable in the usual system paths.
+find_program(VALA_EXECUTABLE
+  NAMES valac)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
+# VALA_EXECUTABLE is set)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
+
+mark_as_advanced(VALA_EXECUTABLE)
+
+# Determine the valac version
+if(VALA_FOUND)
+    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
+                    OUTPUT_VARIABLE "VALA_VERSION")
+    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
+    string(STRIP ${VALA_VERSION} "VALA_VERSION")
+endif(VALA_FOUND)

=== added file 'cmake/GObjectIntrospectionMacros.cmake'
--- cmake/GObjectIntrospectionMacros.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GObjectIntrospectionMacros.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,34 @@
+macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()
+
+macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            -I${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()

=== added file 'cmake/GResource.cmake'
--- cmake/GResource.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GResource.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,67 @@
+#
+#    Copyright (C) 2013 Venom authors and contributors
+#
+#    This file is part of Venom.
+#
+#    Venom is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Venom 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 Venom.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+FIND_PROGRAM(GLIB_COMPILE_RESOURCES_EXECUTABLE NAMES glib-compile-resources)
+MARK_AS_ADVANCED(GLIB_COMPILE_RESOURCES_EXECUTABLE)
+
+INCLUDE(CMakeParseArguments)
+
+FUNCTION(GLIB_COMPILE_RESOURCES output)
+  CMAKE_PARSE_ARGUMENTS(ARGS "" "SOURCE" ${ARGN})
+  SET(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  SET(out_files "")
+
+  FOREACH(src ${ARGS_SOURCE} ${ARGS_UNPARSED_ARGUMENTS})
+    SET(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+    GET_FILENAME_COMPONENT(WORKING_DIR ${in_file} PATH)
+    STRING(REPLACE ".xml" ".c" src ${src})
+    SET(out_file "${DIRECTORY}/${src}")
+    GET_FILENAME_COMPONENT(OUPUT_DIR ${out_file} PATH)
+    FILE(MAKE_DIRECTORY ${OUPUT_DIR})
+    LIST(APPEND out_files "${DIRECTORY}/${src}")
+
+    #FIXME implicit depends currently not working
+    EXECUTE_PROCESS(
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+          "--generate-dependencies"
+          ${in_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE in_file_dep
+    )
+    STRING(REGEX REPLACE "(\r?\n)" ";" in_file_dep "${in_file_dep}")
+    SET(in_file_dep_path "")
+    FOREACH(dep ${in_file_dep})
+      LIST(APPEND in_file_dep_path "${WORKING_DIR}/${dep}")
+    ENDFOREACH(dep ${in_file_dep})
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${out_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+      ARGS
+        "--generate-source"
+        "--target=${out_file}"
+        ${in_file}
+      DEPENDS
+        ${in_file};${in_file_dep_path}
+    )
+  ENDFOREACH(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS})
+  SET(${output} ${out_files} PARENT_SCOPE)
+ENDFUNCTION(GLIB_COMPILE_RESOURCES)

=== added file 'cmake/GSettings.cmake'
--- cmake/GSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GSettings.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,42 @@
+# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
+
+option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON)
+
+option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
+
+if(GSETTINGS_LOCALINSTALL)
+    message(STATUS "GSettings schemas will be installed locally.")
+endif()
+
+if(GSETTINGS_COMPILE)
+    message(STATUS "GSettings shemas will be compiled.")
+endif()
+
+macro(add_schema SCHEMA_NAME)
+
+    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    # Have an option to not install the schema into where GLib is
+    if (GSETTINGS_LOCALINSTALL)
+        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+    else (GSETTINGS_LOCALINSTALL)
+        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
+        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
+    endif (GSETTINGS_LOCALINSTALL)
+
+    # Run the validator and error if it fails
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (_schemas_invalid)
+      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
+    endif (_schemas_invalid)
+
+    # Actually install and recomple schemas
+    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+
+    if (GSETTINGS_COMPILE)
+        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
+    endif ()
+endmacro()

=== added file 'cmake/Tests.cmake'
--- cmake/Tests.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Tests.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,5 @@
+# Test macros for Marlin, feel free to re-use them.
+
+macro(add_test_executable EXE_NAME)
+    add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
+endmacro()

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,203 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+include(CMakeParseArguments)
+
+macro (add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    # be sure that all languages are present
+    # Using all usual languages code from https://www.gnu.org/software/gettext/manual/html_node/Language-Codes.html#Language-Codes
+    # Rare language codes should be added on-demand.
+    set (LANGUAGES_NEEDED aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu)
+    foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
+        create_po_file (${LANGUAGE_NEEDED})
+    endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
+    # generate .mo from .po
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro (add_translations_directory)
+
+# Apply the right default template.
+macro (create_po_file LANGUAGE_NEEDED)
+    set (FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
+    if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
+        file (APPEND ${FILE} "msgid \"\"\n")
+        file (APPEND ${FILE} "msgstr \"\"\n")
+        file (APPEND ${FILE} "\"MIME-Version: 1.0\\n\"\n")
+        file (APPEND ${FILE} "\"Content-Type: text/plain; charset=UTF-8\\n\"\n")
+
+        if ("${LANGUAGE_NEEDED}" STREQUAL "ja"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "vi"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "ko")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "en"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "de"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nl"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sv"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nn"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "no"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fo"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "es"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "pt"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "it"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "bg"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "he"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fi"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "et"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "eo"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "hu"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "tr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "es")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n != 1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "fr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "fr_CA"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "pt_BR")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n>1;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lv")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ro")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "lt")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "ru"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "uk"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "be"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sr"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "hr")
+                file (APPEND ${FILE} "\"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\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "cs"
+            OR "${LANGUAGE_NEEDED}" STREQUAL "sk")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "pl")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
+        elseif ("${LANGUAGE_NEEDED}" STREQUAL "sl")
+                file (APPEND ${FILE} "\"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\\n\"\n")
+        endif ()
+
+    endif ()
+endmacro (create_po_file)
+
+macro (configure_file_translation SOURCE RESULT PO_DIR)
+    find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+    set(EXTRA_PO_DIR ${PO_DIR}/extra/)
+    get_filename_component(EXTRA_PO_DIR ${EXTRA_PO_DIR} ABSOLUTE)
+
+    # Intltool can't create a new directory.
+    get_filename_component(SOURCE_DIRECTORY ${SOURCE} DIRECTORY)
+    file(MAKE_DIRECTORY ${SOURCE_DIRECTORY})
+
+    set (INTLTOOL_FLAG "")
+    if (${SOURCE} MATCHES ".desktop")
+        set (INTLTOOL_FLAG "--desktop-style")
+    elseif (${SOURCE} MATCHES ".gschema")
+        set (INTLTOOL_FLAG "--schemas-style")
+    elseif (${SOURCE} MATCHES ".xml")
+        set (INTLTOOL_FLAG "--xml-style")
+    endif ()
+    execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --quiet ${INTLTOOL_FLAG} ${EXTRA_PO_DIR} ${SOURCE} ${RESULT})
+endmacro ()
+
+macro (add_translations_catalog NLS_PACKAGE)
+    cmake_parse_arguments (ARGS "" "" "DESKTOP_FILES;APPDATA_FILES;SCHEMA_FILES" ${ARGN})
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+    find_program (INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
+
+    set(EXTRA_PO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra)
+
+    set(C_SOURCE "")
+    set(VALA_SOURCE "")
+    set(GLADE_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        if((${FILES_INPUT} MATCHES ${CMAKE_SOURCE_DIR}) OR (${FILES_INPUT} MATCHES ${CMAKE_BINARY_DIR}))
+            set(BASE_DIRECTORY ${FILES_INPUT})
+        else ()
+            set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        endif ()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
+        foreach(VALA_FILE ${SOURCE_FILES})
+            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
+        foreach(GLADE_FILE ${SOURCE_FILES})
+            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_FILE})
+        endforeach()
+    endforeach()
+
+    set (XGETTEXT_C_ARGS --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g")
+    set(BASE_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
+        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${XGETTEXT_C_ARGS} --from-code=UTF-8)
+
+    set(EXTRA_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d extra
+        -o ${EXTRA_PO_DIR}/extra.pot --no-location --from-code=UTF-8)
+
+    set (INTLTOOL_EXTRACT_COMMAND
+        ${INTLTOOL_EXTRACT_EXECUTABLE} --local --srcdir=/)
+
+    set(CONTINUE_FLAG "")
+
+    IF(NOT "${C_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${VALA_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
+        add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
+    ENDIF()
+
+    # We need to create the directory if one extra content exists.
+    IF((NOT "${ARGS_DESKTOP_FILES}" STREQUAL "") OR (NOT "${ARGS_APPDATA_SOURCE}" STREQUAL "") OR (NOT "${ARGS_SCHEMA_SOURCE}" STREQUAL ""))
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/extra/)
+    ENDIF()
+
+    set(CONTINUE_FLAG "")
+
+    foreach(DESKTOP_SOURCE ${ARGS_DESKTOP_FILES})
+        get_filename_component(DESKTOP_SOURCE ${DESKTOP_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/keys ${DESKTOP_SOURCE})
+        get_filename_component(DESKTOP_SOURCE_NAME ${DESKTOP_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${DESKTOP_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(APPDATA_SOURCE ${ARGS_APPDATA_FILES})
+        get_filename_component(APPDATA_SOURCE ${APPDATA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/xml ${APPDATA_SOURCE})
+        get_filename_component(APPDATA_SOURCE_NAME ${APPDATA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${APPDATA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(SCHEMA_SOURCE ${ARGS_SCHEMA_FILES})
+        get_filename_component(SCHEMA_SOURCE ${SCHEMA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/schemas ${SCHEMA_SOURCE})
+        get_filename_component(SCHEMA_SOURCE_NAME ${SCHEMA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${SCHEMA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+endmacro ()

=== added file 'cmake/Uninstall.cmake'
--- cmake/Uninstall.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Uninstall.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,25 @@
+# Taken from CMake FAQ http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
+# TODO: that should probably be improved, do we really need to configure a file to read something in the current binary directory?
+if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+    message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+cmake_policy (SET CMP0007 NEW)
+list(REVERSE files)
+foreach (file ${files})
+    message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+    if (EXISTS "$ENV{DESTDIR}${file}")
+        execute_process(
+            COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
+            OUTPUT_VARIABLE rm_out
+            RESULT_VARIABLE rm_retval
+        )
+        if(NOT ${rm_retval} EQUAL 0)
+            message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+        endif (NOT ${rm_retval} EQUAL 0)
+    else (EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    endif (EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)

=== added file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaPrecompile.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,251 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012-2016 elementary LLC.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+find_package(Vala REQUIRED)
+include(CMakeParseArguments)
+
+##
+# Compile vala files to their c equivalents for further processing. 
+#
+# The "vala_precompile" macro takes care of calling the valac executable on the
+# given source to produce c files which can then be processed further using
+# default cmake functions.
+# 
+# The first parameter provided is a variable, which will be filled with a list
+# of c files outputted by the vala compiler. This list can than be used in
+# conjuction with functions like "add_executable" or others to create the
+# neccessary compile rules with CMake.
+# 
+# The initial variable is followed by a list of .vala files to be compiled.
+# Please take care to add every vala file belonging to the currently compiled
+# project or library as Vala will otherwise not be able to resolve all
+# dependencies.
+# 
+# The following sections may be specified afterwards to provide certain options
+# to the vala compiler:
+# 
+# PACKAGES
+#   A list of vala packages/libraries to be used during the compile cycle. The
+#   package names are exactly the same, as they would be passed to the valac
+#   "--pkg=" option.
+# 
+# OPTIONS
+#   A list of optional options to be passed to the valac executable. This can be
+#   used to pass "--thread" for example to enable multi-threading support.
+#
+# CUSTOM_VAPIS
+#   A list of custom vapi files to be included for compilation. This can be
+#   useful to include freshly created vala libraries without having to install
+#   them in the system.
+#
+# GENERATE_VAPI
+#   Pass all the needed flags to the compiler to create an internal vapi for
+#   the compiled library. The provided name will be used for this and a
+#   <provided_name>.vapi file will be created.
+# 
+# GENERATE_HEADER
+#   Let the compiler generate a header file for the compiled code. There will
+#   be a header file as well as an internal header file being generated called
+#   <provided_name>.h and <provided_name>_internal.h
+#
+# GENERATE_GIR
+#   Have the compiler generate a GObject-Introspection repository file with
+#   name: <provided_name>.gir. This can be later used to create a binary typelib
+#   using the GI compiler.
+#
+# GENERATE_SYMBOLS
+#   Output a <provided_name>.symbols file containing all the exported symbols.
+# 
+# The following call is a simple example to the vala_precompile macro showing
+# an example to every of the optional sections:
+#
+#   vala_precompile(VALA_C mytargetname
+#       source1.vala
+#       source2.vala
+#       source3.vala
+#   PACKAGES
+#       gtk+-2.0
+#       gio-1.0
+#       posix
+#   DIRECTORY
+#       gen
+#   OPTIONS
+#       --thread
+#   CUSTOM_VAPIS
+#       some_vapi.vapi
+#   GENERATE_VAPI
+#       myvapi
+#   GENERATE_HEADER
+#       myheader
+#   GENERATE_GIR
+#       mygir
+#   GENERATE_SYMBOLS
+#       mysymbols
+#   )
+#
+# Most important is the variable VALA_C which will contain all the generated c
+# file names after the call.
+##
+
+macro(vala_precompile output target_name)
+    cmake_parse_arguments (ARGS "" "GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;DIRECTORY" "PACKAGES;OPTIONS;CUSTOM_VAPIS" ${ARGN})
+
+    if(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
+    else(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif(ARGS_DIRECTORY)
+    include_directories(${DIRECTORY})
+    set(vala_pkg_opts "")
+    foreach(pkg ${ARGS_PACKAGES})
+        list(APPEND vala_pkg_opts "--pkg=${pkg}")
+    endforeach(pkg ${ARGS_PACKAGES})
+    set(in_files "")
+    set(out_files "")
+    set(out_files_display "")
+    set(${output} "")
+
+    foreach(src ${ARGS_UNPARSED_ARGUMENTS})
+        string(REGEX MATCH "^/" IS_MATCHED ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            set(src_file_path ${src})
+        else()
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
+        endif()
+        list(APPEND in_files ${src_file_path})
+        string(REPLACE ".vala" ".c" src ${src})
+        string(REPLACE ".gs" ".c" src ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            get_filename_component(VALA_FILE_NAME ${src} NAME)
+            set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+            list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+        else()
+            set(out_file "${DIRECTORY}/${src}")
+            list(APPEND out_files "${DIRECTORY}/${src}")
+        endif()
+        list(APPEND ${output} ${out_file})
+        list(APPEND out_files_display "${src}")
+    endforeach(src ${ARGS_DEFAULT_ARGS})
+
+    set(custom_vapi_arguments "")
+    if(ARGS_CUSTOM_VAPIS)
+        # Check for relative and absolute paths
+        foreach(vapi ${ARGS_CUSTOM_VAPIS})
+            string(REGEX MATCH "^/" IS_MATCHED ${vapi})
+            if(${IS_MATCHED} MATCHES "/")
+                list(APPEND custom_vapi_arguments ${vapi})
+            else()
+                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
+            endif()
+        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
+    endif(ARGS_CUSTOM_VAPIS)
+
+    set(vapi_arguments "")
+    if(ARGS_GENERATE_VAPI)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
+        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
+
+        # Header and internal header is needed to generate internal vapi
+        if (NOT ARGS_GENERATE_HEADER)
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        endif(NOT ARGS_GENERATE_HEADER)
+    endif(ARGS_GENERATE_VAPI)
+
+    set(header_arguments "")
+    if(ARGS_GENERATE_HEADER)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
+        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
+    endif(ARGS_GENERATE_HEADER)
+
+    set(gir_arguments "")
+    set(gircomp_command "")
+    if(ARGS_GENERATE_GIR)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
+        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
+        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
+    endif(ARGS_GENERATE_GIR)
+
+    set(symbols_arguments "")
+    if(ARGS_GENERATE_SYMBOLS)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
+        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
+        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
+    endif(ARGS_GENERATE_SYMBOLS)
+
+    # Workaround for a bug that would make valac run twice. This file is written
+    # after the vala compiler generates C source code.
+    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
+
+    add_custom_command(
+    OUTPUT
+        ${OUTPUT_STAMP}
+    COMMAND 
+        ${VALA_EXECUTABLE} 
+    ARGS 
+        "-C" 
+        ${header_arguments} 
+        ${vapi_arguments} 
+        ${gir_arguments} 
+        ${symbols_arguments} 
+        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
+        "-d" ${DIRECTORY} 
+        ${vala_pkg_opts} 
+        ${ARGS_OPTIONS} 
+        "-g"
+        ${in_files} 
+        ${custom_vapi_arguments}
+    COMMAND
+        touch
+    ARGS
+        ${OUTPUT_STAMP}
+    DEPENDS 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    COMMENT
+        "Generating ${out_files_display}"
+    ${gircomp_command}
+    )
+
+    # This command will be run twice for some reason (pass a non-empty string to COMMENT
+    # in order to see it). Since valac is not executed from here, this won't be a problem.
+    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
+endmacro(vala_precompile)

=== added file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaVersion.cmake	2016-01-14 14:02:26 +0000
@@ -0,0 +1,96 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+find_package(Vala REQUIRED)
+include(CMakeParseArguments)
+
+##
+# Ensure a certain valac version is available
+#
+# The initial argument is the version to check for
+# 
+# It may be followed by a optional parameter to specifiy a version range. The
+# following options are valid:
+# 
+# EXACT
+#   Vala needs to be available in the exact version given
+# 
+# MINIMUM
+#   The provided version is the minimum version. Therefore Vala needs to be
+#   available in the given version or any higher version
+#
+# MAXIMUM
+#   The provided version is the maximum. Therefore Vala needs to be available
+#   in the given version or any version older than this
+#
+# If no option is specified the version will be treated as a minimal version.
+##
+macro(ensure_vala_version version)
+    cmake_parse_arguments (ARGS "" "MINIMUM;MAXIMUM;EXACT" "" ${ARGN})
+	set(compare_message "")
+	set(error_message "")
+	if(ARGS_MINIMUM)
+		set(compare_message "a minimum ")
+		set(error_message "or greater ")
+	elseif(ARGS_MAXIMUM)
+		set(compare_message "a maximum ")
+		set(error_message "or less ")
+	endif(ARGS_MINIMUM)
+	
+	message(STATUS 
+		"checking for ${compare_message}Vala version of ${version}"
+	)
+
+	unset(version_accepted)
+	
+	# MINIMUM is the default if no option is specified
+	if(ARGS_EXACT)
+		if(${VALA_VERSION} VERSION_EQUAL ${version} )
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_EQUAL ${version})
+	elseif(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	else(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	endif(ARGS_EXACT)
+
+	if (NOT version_accepted)
+		message(FATAL_ERROR 
+			"Vala version ${version} ${error_message}is required."
+		)
+	endif(NOT version_accepted)
+
+	message(STATUS
+		"  found Vala, version ${VALA_VERSION}"
+	)
+endmacro(ensure_vala_version)

=== removed file 'configure'
--- configure	2014-06-23 23:31:51 +0000
+++ configure	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 2009-2013 Yorba Foundation
-#
-# This software is licensed under the GNU LGPL (version 2.1 or later).
-# See the COPYING file in this distribution.
-
-CONFIG_IN=configure.mk
-
-configure_help() {
-    cat <<- EOT
-Usage:
-    ./configure [OPTIONS]...
-
-Options:
-    -h, --help              Print this help and exit.
-    --assume-pkgs           Turn off package version checking.
-    --build=DIR             Build secondary files in DIR.
-    --debug | --release	    Build executable for debugging or release.
-                            [--release]
-    --profile               Enable profiling support during C compile & link.
-    --prefix=PREFIX         Prepend PREFIX to program installation paths.
-                            [/usr/local]
-    --lib=LIBNAME           Set system library directory name to LIBNAME
-                            (usually 'lib' or 'lib64').
-                            [lib]
-    --libdir LIBNAME        Equivalent to --lib=LIBNAME
-    --libexec=LIBEXECDIR    Set utility executable to LIBEXECDIR
-                            (usually 'PREFIX/libexec/shotwell').
-                            [PREFIX/libexec/shotwell]
-    --libexec LIBEXECDIR    Equivalent to --libexec=LIBEXECDIR
-
-    --define=SYMBOL         Define a symbol for the Vala compiler.
-
-
-    --disable-schemas-compile
-                            Disable compiling the GSettings schema.
-    --disable-gsettings-convert-install
-                            Disable installing the gsettings-data-convert file.
-    --disable-desktop-update
-                            Disable desktop database update.
-    --disable-desktop-validate
-                            Disable validation of .desktop files.
-    --disable-icon-update
-                            Disable icon cache update.
-    --enable-build-for-glade
-                            Enable build for Glade-related development.
-    --disable-help-install
-                            Disable installation of online help.
-    --disable-extra-plugins-install
-                            Disable installation of extra (non-core) plugins.
-    --install-headers
-                            Install headers and VAPI files (developers only).
-    --unity-support
-                            Enable support for progress bars in the Unity launcher.
-EOT
-}
-
-abort() {
-    printf "%s: Invalid argument %s\n" $0 $1
-    configure_help
-    exit 1
-}
-
-while [ $# != 0 ]
-do
-    option=`echo $1 | sed 's/=.*//'`
-    if [ `echo $1 | grep '='` ]
-    then
-        value=`echo $1 | sed 's/.*=//'`
-    fi
-
-    case $option in
-        -h | --help)        configure_help
-                            exit 0
-                            ;;
-        
-        --prefix)           if [ ! $value ]
-                            then
-                                shift
-                                value=$1
-                            fi
-                            
-                            variables="${variables}PREFIX=$value\n"
-                            ;;
-
-        --lib | --libdir)   if [ ! $value ]
-                            then
-                                shift
-                                value=$1
-                            fi
-                            
-                            variables="${variables}LIB=$value\n"
-                            ;;
-
-        --libexec)          if [ ! $value ]
-                            then
-                                shift
-                                value=$1
-                            fi
-                            
-                            variables="${variables}LIBEXECDIR=$value\n"
-                            ;;
-
-        --assume-pkgs)      variables="${variables}ASSUME_PKGS=1\n"
-                            ;;
-        
-        --build)            if [ ! $value ]
-                            then
-                                shift
-                                value=$1
-                            fi
-                            
-                            variables="${variables}BUILD_DIR=$value\n"
-                            ;;
-        
-        --debug)            variables="${variables}BUILD_RELEASE=\nBUILD_DEBUG=1\n"
-                            ;;
-        
-        --profile)          variables="${variables}PROFILE_FLAGS=-pg\n"
-                            ;;
-        
-        --release)          variables="${variables}BUILD_DEBUG=\nBUILD_RELEASE=1\n"
-                            ;;
-        
-        --define)           variables="${variables}USER_VALAFLAGS+=--define=$value\n"
-                            ;;
-                            
-        --disable-schemas-compile)        variables="${variables}DISABLE_SCHEMAS_COMPILE=1\n"
-                                          ;;
-        
-        --disable-gsettings-convert-install)    variables="${variables}DISABLE_GSETTINGS_CONVERT_INSTALL=1\n"
-                                                ;;
-        
-        --disable-desktop-update)         variables="${variables}DISABLE_DESKTOP_UPDATE=1\n"
-                                          ;;
-
-        --disable-desktop-validate)       variables="${variables}DISABLE_DESKTOP_VALIDATE=1\n"
-                                          ;;
-
-        --disable-icon-update)            variables="${variables}DISABLE_ICON_UPDATE=1\n"
-                                          ;;
-
-        --enable-build-for-glade)         variables="${variables}ENABLE_BUILD_FOR_GLADE=1\n"
-                                          ;;
-        --disable-help-install)           variables="${variables}DISABLE_HELP_INSTALL=1\n"
-                                          ;;
-        --disable-extra-plugins-install)  variables="${variables}DISABLE_EXTRA_PLUGINS_INSTALL=1\n"
-                                          ;;
-        
-        --install-headers)                variables="${variables}INSTALL_HEADERS=1\n"
-                                          ;;
-        
-        --unity-support)                  variables="${variables}UNITY_SUPPORT=1\n"
-                                          ;;
-        
-        --enable-* | --disable-*)
-        
-                            echo WARNING: unrecognized option: $option
-                            ;;
-        
-        *)                  if [ `echo $option | grep '\-\-'` ]
-                            then
-                                # we've hit a bogus '--' -type argument, don't accept it.
-                                abort $option
-                            fi
-                            
-                            # this argument isn't for us; pass it on to the makefile phase.
-                            variables="${variables}${option}=${value}\n"
-                            ;;
-    esac
-
-    value=""
-    shift
-done
-
-rm -f $CONFIG_IN
-if [ $variables ]
-then
-    echo -e -n $variables > $CONFIG_IN
-fi
-echo "CONFIG_IN=${CONFIG_IN}" >> $CONFIG_IN
-
-printf "Configured.  Type 'make' to build, 'make install' to install.\n"
\ No newline at end of file

=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2016-01-14 14:02:26 +0000
@@ -0,0 +1,19 @@
+include (Translations)
+configure_file (${CMAKE_PROJECT_NAME}.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop.in)
+configure_file (${CMAKE_PROJECT_NAME}-viewer.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-viewer.desktop.in)
+configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-viewer.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-viewer.desktop ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation (${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop DESTINATION ${DATADIR}/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-viewer.desktop DESTINATION ${DATADIR}/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml DESTINATION ${DATADIR}/appdata)
+
+# Install custom icons
+file (GLOB ICON_FILES icons/*)
+install (FILES ${ICON_FILES} DESTINATION ${PKGDATADIR}/icons)
+
+# Install UI files
+file (GLOB UI_FILES ui/*)
+install (FILES ${UI_FILES} DESTINATION ${PKGDATADIR}/ui)
+

=== renamed directory 'icons' => 'data/icons'
=== renamed file 'misc/pantheon-photos-viewer.desktop.head' => 'data/pantheon-photos-viewer.desktop.in.in'
--- misc/pantheon-photos-viewer.desktop.head	2015-06-08 08:05:59 +0000
+++ data/pantheon-photos-viewer.desktop.in.in	2016-01-14 14:02:26 +0000
@@ -1,15 +1,17 @@
 [Desktop Entry]
-Version=1.0
-Name=Photo Viewer
-GenericName=Photo Viewer
-Exec=pantheon-photos %f
+_Name=Photo Viewer
+_GenericName=Photo Viewer
+Exec=@EXEC_NAME@ %U
 Icon=multimedia-photo-viewer
+_Keywords=install;uninstall;remove;catalogue;store;apps;updates;software;
 Terminal=false
 NoDisplay=true
 Type=Application
+StartupNotify=true
 MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;
 Categories=Graphics;Viewer;Photography;GNOME;GTK;
-X-GIO-NoFuse=true
-X-GNOME-Gettext-Domain=shotwell
-X-GNOME-FullName=Photo Viewer
 Actions=AboutDialog;
+
+[Desktop Action AboutDialog]
+_Name=About @APP_NAME@
+Exec=@EXEC_NAME@ --about

=== renamed file 'misc/pantheon-photos.appdata.xml' => 'data/pantheon-photos.appdata.xml.in'
--- misc/pantheon-photos.appdata.xml	2015-12-04 03:04:56 +0000
+++ data/pantheon-photos.appdata.xml.in	2016-01-14 14:02:26 +0000
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Yorba Foundation ([e-mail])
-     Copyright 2015 elementary, LLC <[e-mail]> -->
-<application>
-  <id type="desktop">pantheon-photos.desktop</id>
-  <licence>CC0</licence>
+<!-- Copyright 2015-2016 elementary, LLC <[e-mail]> -->
+<component type="desktop">
+  <id>pantheon-photos.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
   <project_group>elementary</project_group>
-  <name>Photos</name>
-  <icon type="stock">multimedia-photo-manager</icon>
-  <summary>Popular photo manager</summary>
+  <project_license>GPL-3.0+</project_license>
+  <_name>Photos</_name>
+  <_summary>Popular photo manager</_summary>
   <description>
-    <p>
+    <_p>
       Photos is an easy-to-use, fast photo organizer. It allows you to import
       photos from your camera or disk, organize them by date and subject matter,
       even ratings. It also offers basic photo editing, like crop, red-eye correction,
       color adjustments, and straighten. Photos' non-destructive photo editor does
       not alter your master photos, making it easy to experiment and correct errors.
-    </p>
-    <p>
+    </_p>
+    <_p>
       Photos supports JPEG, PNG, TIFF, and a variety of RAW file formats.
-    </p>
+    </_p>
   </description>
-  <url type="homepage">https://elementary.io/</url>
-  <updatecontact>contact_at_elementary.io</updatecontact>
-</application>
+  <provides>
+    <binary>pantheon-photos</binary>
+  </provides>
+  <developer_name>elementary LLC.</developer_name>
+  <url type="homepage">http://elementary.io/</url>
+  <url type="bugtracker">https://bugs.launchpad.net/pantheon-photos</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/photos</url>
+  <update_contact>contact_at_elementary.io</update_contact>
+</component>

=== renamed file 'misc/pantheon-photos.desktop.head' => 'data/pantheon-photos.desktop.in.in'
--- misc/pantheon-photos.desktop.head	2015-06-08 08:05:59 +0000
+++ data/pantheon-photos.desktop.in.in	2016-01-14 14:02:26 +0000
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Version=1.0
-Name=Photos
-GenericName=Photo Manager
-Comment=Organize your photos
-Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;
-Exec=pantheon-photos %U
+_Name=@APP_NAME@
+_Comment=Organize your photos
+Exec=@EXEC_NAME@ %U
 Icon=multimedia-photo-manager
+_GenericName=Photo Manager
+_Keywords=album;cameras;crop;edit;enhance;export;gallery;images;import;organize;photographs;photos;pictures;photography;print;publish;rotate;share;tags;video
 Terminal=false
 Type=Application
+StartupNotify=true
 MimeType=x-content/image-dcf;
 Categories=Graphics;Photography;GNOME;GTK;
-X-GIO-NoFuse=true
-X-GNOME-Gettext-Domain=shotwell
-X-GNOME-FullName=Photos
+Actions=AboutDialog;
 X-GNOME-UsesNotifications=false
-Actions=AboutDialog;
 
+[Desktop Action AboutDialog]
+_Name=About @APP_NAME@
+Exec=@EXEC_NAME@ --about

=== renamed directory 'ui' => 'data/ui'
=== removed directory 'help'
=== removed directory 'help/C'
=== removed file 'help/C/Makefile'
--- help/C/Makefile	2013-01-21 21:16:09 +0000
+++ help/C/Makefile	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#
-# This produces the index.cache file and converts all the .page files in this directory
-# to HTML.
-# 
-# Adapted from http://www.mail-archive.com/[e-mail]/msg04608.html
-# and the mal2html script in the yelp-xsl package.
-#
-# Copyright 2010-2013 Yorba Foundation
-#
-
-pages=$(wildcard *.page)
-htmls=$(patsubst %.page,%.html,$(pages))
-
-all: $(htmls) index.cache
-
-index.cache : $(pages)
-	echo '<cache:cache xmlns:cache="http://projectmallard.org/cache/1.0/" xmlns="http://projectmallard.org/1.0/">' > index.temp
-	for page in $(pages); do \
-	  echo "<page cache:href='file://`pwd`/$$page'/>" >> index.temp; \
-	done
-	echo '</cache:cache>' >> index.temp
-	xsltproc `pkg-config --variable xsltdir gnome-doc-utils`/mallard/cache/mal-cache.xsl index.temp > index.cache
-	rm index.temp
-
-$(htmls) : index.cache
-$(htmls) : %.html : %.page
-	xsltproc \
-	  --stringparam mal.cache.file `pwd`/index.cache \
-	  --param mal.chunk.chunk_top 1 \
-	  `pkg-config --variable mal2html gnome-doc-utils` $<
-
-.PHONY: clean
-clean:
-	rm -f index.cache *.html index.css index.temp
-

=== removed file 'help/C/edit-adjustments.page'
--- help/C/edit-adjustments.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-adjustments.page	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-adjustments">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Change the exposure, saturation, tint, and shadows of a photo.</desc>
-        
-        <link type="next" xref="edit-crop" />
-    </info>
-
-   <title>Color adjustments</title>
-
-<p>The <gui>Adjust</gui> button opens a floating window with a histogram and sliders to adjust a photo's exposure, saturation, tint, temperature, and shadows. The histogram also has sliders to reduce the upper and lower intensity thresholds of the photograph, expanding the contrast of the middle range.</p>
-
-<p>The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to improve the quality of a photo.</p>
-
-<p>When the photo's colors and contrast are to your liking, press <gui>Apply</gui> to save the changes. <gui>Reset</gui> will return the image to its original state. <gui>Cancel</gui> discards all changes you've made.</p>
-
-<section>
- <title>What do the color adjustments do?</title>
- <terms>
-  <item>
-   <title>Exposure</title>
-   <p>Changes the brightness to make it look like the photo was exposed for a longer or shorter time. Use this to correct under- or over-exposed photos.</p>
-  </item>
-  <item>
-   <title>Saturation</title>
-   <p>Changes how vivid colors look. If your photo looks gray and washed out, try increasing the saturation. If colors look too bold, try decreasing it.</p>
-  </item>
-  <item>
-   <title>Tint</title>
-   <p>This tints the photo with a color. It's useful for correcting photos taken with the wrong white balance setting, which typically have an unnatural color cast. For example, photos taken outdoors with the white balance set to "Tungsten" may have a blue cast.</p>
-  </item>
-  <item>
-   <title>Temperature</title>
-   <p>Changes how "warm" or "cool" the picture looks. Use this to make cold, depressing scenes look more lively, for example.</p>
-  </item>
-  <item>
-   <title>Shadows</title>
-   <p>This makes shadowy areas appear lighter. Use this to make detail more visible if it's obscured by the darkness of a shadow.</p>
-  </item>
-  <item>
-   <title>Intensity Threshold (sliders on the histogram)</title>
-   <p>These sliders change how light the brightest white is and how dark the darkest black is. Use them to change the contrast of the photo. Photos which look washed out should particularly benefit from changing these settings.</p>
-  </item>
- </terms>
-</section>
-    
-</page>
-

=== removed file 'help/C/edit-crop.page'
--- help/C/edit-crop.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-crop.page	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-crop">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Improve the composition of a photo by cutting out parts of it.</desc>
-        
-        <link type="next" xref="edit-external" />
-    </info>
-
-   <title>Cropping</title>
-
-    <p>To reduce the area of a photo and concentrate the viewer's attention on a smaller portion of it, use the Crop tool.
-    The crop tool is only available in full-window or fullscreen mode.</p>
-
-<steps>
- <item>
-  <p>Double-click on a photo to enter full-window mode, then press the <gui>Crop</gui> button on the toolbar.</p>
- </item>
- <item>
-  <p>A white box, the crop rectangle, will appear over the photo. The lighter portion of the photo within the crop rectangle represents what the photo will look like when you crop it.</p>
- </item>
- <item>
-  <p>If you place your cursor in the middle of the box, you can move the box around. If you drag the edges of the box, you can adjust its size. As you move and adjust the crop box, you'll see four lines appear inside it, like a tic-tac-toe grid. These are <em>rule of thirds</em> lines.</p>
-  <p>You can also constrain the crop box to one of many common sizes. Choose a size from the drop-down list that suits your needs. If you press the flip button next to it, the orientation of the constraint will switch (from landscape to portrait).</p>
- </item>
- <item>
-  <p>When you're happy with your crop outline, press the <gui>Apply</gui> button. Shotwell will display the cropped photo.</p>
- </item>
- <item>
-  <p>If you change your mind, press the <gui>Crop</gui> button again and fine-tune the crop.</p>
-  <p>If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will return to the photo's previous crop dimensions.</p>
- </item>
-</steps>
-
-<section>
- <title>What is the rule of thirds?</title>
- <p>The <em>rule of thirds</em> helps you to choose a pleasing composition for a photo.</p>
- <p>Imagine that the scene is divided up into a 3x3 grid by two equally-spaced vertical lines and two equally-spaced horizontal lines. According to the rule, you're more likely to get a pleasing composition if you align major features (like the horizon, or a person's body) with one of the lines. Paying attention to the way features flow from one part of the grid to another can also help.</p>
- <p>Cropping a photo so that it conforms to the rule of thirds often results in a more visually appealing image.</p>
- <media type="image" src="figures/crop_thirds.jpg">
-  <p>Cropping a photo, using the "rule of thirds" lines to improve the composition.</p>
- </media>
-</section>
-</page>

=== removed file 'help/C/edit-enhance.page'
--- help/C/edit-enhance.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-enhance.page	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-enhance">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Let Shotwell improve the brightness and contrast of a photo automatically.</desc>
-        
-        <link type="seealso" xref="edit-adjustments" />
-        
-        <link type="next" xref="edit-adjustments" />
-    </info>
-
-   <title>Auto-enhance</title>
-
-    <p>Clicking on the <gui>Enhance</gui> button is a quick way to automatically adjust the brightness and contrast of your photo. It will often give you a photo that is correctly exposed. You can also use it as a starting point and then improve the adjustments by clicking on the <gui>Adjust</gui> button.</p>
-</page>

=== removed file 'help/C/edit-external.page'
--- help/C/edit-external.page	2011-10-13 23:58:57 +0000
+++ help/C/edit-external.page	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-external">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Use a different program to edit a photo.</desc>
-        
-        <link type="next" xref="edit-redeye" />
-    </info>
-
-    <title>
-        Edit photos with an external program
-    </title>
-
-    <p>
-        You might want to use an external editor to do additional work on a photo.
-        If installed, GIMP and UFRaw are the default external editors for photo and RAW editing, 
-        respectively.  If these programs are not installed, you must select your preferred 
-        editors by choosing <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and selecting
-        editors from drop-down menus of installed applications.
-    </p>
-
-    <p>
-        Once your editors have been set, select a photo and choose <guiseq><gui>Photos</gui>
-        <gui>Open With External Editor</gui></guiseq> to open the photo with the external editor.
-        Likewise, if the original photo is a RAW file, select <guiseq><gui>Photos</gui><gui>Open 
-        With RAW Editor</gui></guiseq> to edit the RAW file directly with the set RAW editor.
-    </p>
-
-    <p>
-        When you complete your edits and save the file, Shotwell will detect the changes and 
-        update the photo.   When external edits have been made, press and hold the 
-        <key>Shift</key> key in full-window view to show the original photo rather than the 
-        externally-edited one.
-    </p>
-                            
-    <p>
-        Reverting to original will erase any external edits.
-    </p>
-    
-    <note>
-        <p>
-            If you externally edit a RAW photo and save the result to another image, such as a
-            JPEG or PNG, Shotwell cannot automatically determine that the original RAW and the 
-            new image should be paired.
-        </p>
-            
-        <p>    
-            If you want to work within the resulting image within Shotwell, you'll need to 
-            import it yourself.
-        </p>
-    </note>    
-</page>

=== removed file 'help/C/edit-nondestructive.page'
--- help/C/edit-nondestructive.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-nondestructive.page	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-nondestructive">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Shotwell is a non-destructive photo editor - it does not modify your original photos.</desc>
-        
-        <link type="next" xref="edit-time-date" />
-    </info>
-
-	<title>What happens to the original when I edit a photo?</title>
-
-<p>Shotwell is a non-destructive photo editor. It does not modify your original photographs. That is to say, if you crop a photo or adjust its colors, the photo file on disc remains untouched. Shotwell stores your edits in a database and applies them on the fly as necessary. This means you can undo any alterations you make to a photograph.</p>
-
-<p>If you want to see what a photo looked like before your modifications, press the <key>Shift</key> key. The original photo will be displayed as long as you hold the key down.</p>
-
-<p>Note that Shotwell can optionally write metadata (such as tags and titles) to photo files.
-For more information, see the section <link xref="other-files">Photo files</link>.</p>
-
-</page>
-

=== removed file 'help/C/edit-redeye.page'
--- help/C/edit-redeye.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-redeye.page	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-redeye">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Correct photos where people have red eyes because of the camera's flash.</desc>
-        
-        <link type="next" xref="edit-rotate" />
-    </info>
-
-	<title>Removing red-eye</title>
-
-    <p>Red-eye occurs when the camera's flash reflects off the pupil of someone's eye. To eliminate this in a photo, use the Red-eye tool.</p>
-    <steps>
-     <item>
-      <p>Click <gui>Red-eye</gui>. A circle will appear on the photo.</p>
-     </item>
-     <item>
-      <p>Drag the circle over the affected pupil, adjust its size with the slider control, and press <gui>Apply</gui>. The redness will be removed.</p>
-     </item>
-     <item>
-      <p>Repeat this process for all red pupils in your photo. Press <gui>Close</gui> when finished.</p>
-     </item>
-    </steps>
-</page>

=== removed file 'help/C/edit-rotate.page'
--- help/C/edit-rotate.page	2012-04-03 01:14:09 +0000
+++ help/C/edit-rotate.page	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-rotate">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Click the <gui>Rotate</gui> button, or choose one of the commands in the <gui>Photo</gui> menu.</desc>
-        
-        <link type="next" xref="edit-straighten" />
-    </info>
-
-	<title>Rotate or flip a photo</title>
-
-    <p>You can rotate your photos left and right (clockwise and counterclockwise) with the <gui>Rotate</gui> button on the toolbar of most views. You can also make a mirror image of any photo.</p>
-    
-    <p>To rotate right, click on the <gui>Rotate</gui> button. To rotate left, press and hold the <key>Ctrl</key> key and then click the button. Both commands are available in the <gui>Photos</gui> menu too.  Alternatively, use the following keyboard shortcuts:</p>
-    <list>
-    <item><p>rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or <key>[</key></p></item>
-    <item><p>rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key></p></item>
-    </list>
-    <p>To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> command in the <gui>Photos</gui> menu. To flip an image vertically, use the <gui>Flip Vertically</gui> command in the same menu.</p>
-    
-    <note>
-     <p>If you select more than one image, you can rotate all of them at the same time.</p>
-    </note>
-    
-</page>

=== removed file 'help/C/edit-straighten.page'
--- help/C/edit-straighten.page	2012-04-03 01:14:09 +0000
+++ help/C/edit-straighten.page	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-straighten">
-      
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Straighten a photo so that its horizon appears level.</desc>
-        
-   	<link type="next" xref="edit-undo" />
-    </info>
-    
-    	<title>Straighten photos</title>
-    	
-<p>The straighten tools allows photos to be leveled and straightened. The straighten tool is only available in full-window or fullscreen mode. </p>
-
- <steps>
-     <item>
-      <p>Click <gui>Straighten</gui>. The straighten slider will appear. Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
-     </item>
-     <item>
-      <p>Drag the slider to achieve the desired degree of straightening.</p>
-     </item>
-     <item>
-      <p>Press <gui>OK</gui> when finished.</p>
-     </item>
- </steps>
-
-</page>	

=== removed file 'help/C/edit-time-date.page'
--- help/C/edit-time-date.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-time-date.page	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-time-date">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Change the time and date of photos if those details are incorrect.</desc>
-        
-        <link type="next" xref="edit-enhance" />
-    </info>
-
-	<title>Adjust the time and date of photos</title>
-
-<p>To adjust the time and date of photos, select the photos you would like to adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Time and Date</gui></guiseq> and select a new time and date.</p>
-
-<p>If you are changing the date and time of multiple photos at once, you can choose to shift all the photos by the same amount of time or to set all the photos to the same time.</p>
-
-<p>By default, the time and date are only changed inside Shotwell. You can also choose to modify the time and date in the original file, but this cannot be undone once you exit Shotwell.</p>
-
-</page>
-

=== removed file 'help/C/edit-undo.page'
--- help/C/edit-undo.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-undo.page	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit-undo">
-
-    <info>
-        <link type="guide" xref="index#edit"/>
-        <desc>Return a photo to its original, unedited form.</desc>
-        
-        <link type="seealso" xref="edit-nondestructive" />
-        
-        <link type="next" xref="edit-nondestructive" />
-    </info>
-
-	<title>Undoing changes</title>
-    
-    <p>Because Shotwell is a non-destructive photo editor, you can undo any alterations you make to a photograph.</p>
-    
-    <p>If you want to see what a photo looked like before your modifications, press the <key>Shift</key> key. The original photo will be displayed as long as you hold the key down.</p>
-
-    <p>To completely undo all the changes you've made to a photo, click <guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only exception is that time and date adjustments will not be reverted.</p>
-
-</page>

=== removed directory 'help/C/figures'
=== removed file 'help/C/figures/crop_thirds.jpg'
Binary files help/C/figures/crop_thirds.jpg	2010-08-26 18:55:49 +0000 and help/C/figures/crop_thirds.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'help/C/figures/edit_toolbar.png'
Binary files help/C/figures/edit_toolbar.png	2010-08-20 01:34:02 +0000 and help/C/figures/edit_toolbar.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'help/C/figures/editing_overview.png'
Binary files help/C/figures/editing_overview.png	2010-08-20 01:34:02 +0000 and help/C/figures/editing_overview.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'help/C/figures/shotwell_logo.png'
Binary files help/C/figures/shotwell_logo.png	2010-08-20 01:34:02 +0000 and help/C/figures/shotwell_logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'help/C/figures/trash_process.png'
Binary files help/C/figures/trash_process.png	2010-08-20 01:34:02 +0000 and help/C/figures/trash_process.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'help/C/formats.page'
--- help/C/formats.page	2011-09-02 19:02:26 +0000
+++ help/C/formats.page	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="formats">
-
-    <info>
-        <link type="guide" xref="index"/>
-        <desc>Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video files.</desc>
-        
-        <link type="next" xref="running" />
-    </info>
-
-	<title>Supported photo and video formats</title>
-
-   <p>Shotwell supports JPEG, PNG, TIFF, BMP and <link type="guide" xref="other-raw">RAW</link> photo files. Shotwell does not yet support other graphics format such as GIF.</p>
-
-<p>Shotwell's RAW format support is currently limited. When you view a RAW photo, you are actually viewing a JPEG derived from the RAW photo, not the RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit - you can only export edited photos as 8-bit files. All supported formats can be used for export (JPEG, PNG, TIFF, BMP).</p>
-
-<p>For more information about RAW-format photos in Shotwell, please see
-the <link type="guide" xref="other-raw">RAW</link> section.
-</p>
-
-<p>Shotwell also supports video files in any format supported by the GStreamer media library on the system where
-Shotwell is running.  This typically includes the following formats among others:</p>
-<list>
-<item><p>Container formats: Ogg, QuickTime, MP4, AVI.</p></item>
-<item><p>Codecs: Theora, Quicktime, MPEG-4, Motion JPEG.  <em>Note that some operating systems may not include all
-codecs listed here due to legal or licensing restrictions.</em></p></item>
-</list>
-
-<p>Shotwell supports both photos and videos, but for simplicity, this documentation uses just the term "photos"
-in most places.  Many operations in Shotwell apply to both photos and videos, however.  In particular, events,
-flagging, rating, tagging, and publishing work both for photos and for videos.</p>
-
-</page>
-

=== removed file 'help/C/import-camera.page'
--- help/C/import-camera.page	2011-08-22 20:44:14 +0000
+++ help/C/import-camera.page	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-camera">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Copy photos from a digital camera.</desc>
-        
-        <link type="next" xref="import-memorycard"/>
-    </info>
-
-	<title>Importing from a camera</title>
-
-    <p>To import photos from a digital camera:</p>
-
-   <steps>
-    <item>
-     <p>Connect the camera to your computer and switch it on.
-    Shotwell will detect it and list it in the sidebar.</p>
-    </item>
-    <item>
-     <p>Select the camera in the sidebar. Previews of each photo on the camera will be displayed.</p>
-    </item>
-    <item>
-     <p>If you like, you can choose a set of specific photos to import. To do this, hold down the <key>Ctrl</key> key and click to select individual photos. You can hold down <key>Shift</key> and click to select a range of photos too.</p>
-    </item>
-    <item>
-     <p>Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos will be copied from the camera and saved on your computer.</p>
-    </item>
-   </steps>
-   
-    <p>Once the import is complete, you can open the <gui>Last Import</gui> view (in the sidebar) to see all photos that were imported. The Events list (also in the sidebar) will also show the new photos, organized by date.</p>
-</page>

=== removed file 'help/C/import-f-spot.page'
--- help/C/import-f-spot.page	2011-08-22 20:44:14 +0000
+++ help/C/import-f-spot.page	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-f-spot">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell can import all your photos and tags from the F-Spot photo manager.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Importing from F-Spot</title>
-
-    <p>To import an existing photo collection from F-Spot:</p>
-    <steps>
-    <item><p>Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>. </p></item>
-    <item><p>Now choose either the default F-Spot library or another F-Spot database.
-    If importing from another F-Spot database, select a directory and file from the chooser dialog box.</p></item>
-    </steps>
-    <p>Shotwell will import your photos, together with their tags and other information.
-    Once the import is complete, you can select <gui>Last Import</gui> in the sidebar to see all photos successfully imported. The Events list will also show new entries for the dates corresponding to the imported photos.</p>
-</page>

=== removed file 'help/C/import-file.page'
--- help/C/import-file.page	2011-09-08 00:16:45 +0000
+++ help/C/import-file.page	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-file">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Import photos that are already saved on your computer.</desc>
-        
-        <link type="next" xref="import-f-spot"/>
-    </info>
-
-	<title>Importing from your hard disk</title>
-
-    <p>To import photo files from your hard disk into Shotwell, just drag them from your file browser into the Shotwell window.</p>
-    
-    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder</gui></guiseq> and select the folder containing the photos you want to import.</p>
-    
-    <p>Shotwell will ask whether you want to copy the photo files to your library folder (usually this is the <file>Pictures</file> folder in your home directory) or to import them in place without copying the files.</p>
-    
-    <p>If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will copy the photos into your library folder without prompting.  Similarly, if you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while dragging photos in, Shotwell will import the photos without copying them.</p>
-
-    <p>Once the import is complete, you can select <gui>Last Import</gui> in the sidebar to see all photos successfully imported. The Events list will also show new entries for the dates corresponding to the imported photos.</p>
-
-</page>

=== removed file 'help/C/import-memorycard.page'
--- help/C/import-memorycard.page	2011-08-22 20:44:14 +0000
+++ help/C/import-memorycard.page	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-memorycard">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Import photos from a digital camera's memory card.</desc>
-        
-        <link type="next" xref="import-file"/>
-    </info>
-
-	<title>Importing from a memory card</title>
-
-<p>To import photos from a camera memory card:</p>
-
-<steps>
- <item>
-  <p>Put the card into your card reader. Make sure the card reader is plugged in to the computer and switched on.</p>
- </item>
- <item>
-  <p>The card reader and card should be detected automatically.</p>
- </item>
- <item>
-  <p>Follow the instructions for <link xref="import-file">importing photos from your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From Folder</gui></guiseq>, the memory card should be visible as a folder in the side bar of the file selection window.</p>
- </item>
-</steps>
-
-<p>Shotwell can import photos from any memory card that is compatible with your card reader.</p>
-
-<p>If the card is not detected automatically, your card reader may not have been recognized. Try unplugging it and then plugging it in again. If that doesn't work, you should still be able to import photos by <link xref="import-camera">connecting your camera directly to the computer</link>, though.</p>
-
-</page>

=== removed file 'help/C/index.page'
--- help/C/index.page	2010-12-23 01:39:32 +0000
+++ help/C/index.page	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="index">
-
-	<info>
-		<title type="link">Shotwell</title>
-     	<title type="text">Shotwell</title>
-		<credit type="author">
-		    <name>Jim Nelson</name>
-		    <email>[e-mail]</email>
-		    <name>Allison Barlow</name>
-		    <email>[e-mail]</email>
-			<name>Robert Ancell</name>
-			<email>[e-mail]</email>
-			<name>Peter Smith</name>
-			<email>[e-mail]</email>
-			<name>Phil Bull</name>
-			<email>[e-mail]</email>
-		</credit>
-	</info>
-
-
-	<title><media type="image" src="figures/shotwell_logo.png"></media>Shotwell Photo Manager</title>
-
-    <section id="import" style="2column">
-        <title>Importing Photos</title>
-    </section>
-
-    <section id="view" style="2column">
-        <title>Viewing Photos</title>
-    </section>
-
-    <section id="organize" style="2column">
-        <title>Organizing Photos</title>
-    </section>
-
-    <section id="edit" style="2column">
-        <title>Editing Photos</title>
-    </section>
-
-    <section id="share" style="2column">
-        <title>Sharing Photos</title>
-    </section>
-
-    <section id="other" style="2column">
-        <title>Other Features</title>
-    </section>
-</page>

=== removed file 'help/C/organize-event.page'
--- help/C/organize-event.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-event.page	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="event">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Group photos together that were taken at the same time. Learn how to rename, merge, and sort events.</desc>
-        
-        <link type="next" xref="flag"/>
-    </info>
-
-	<title>Events</title>
-
-    <p>An event is a group of photos that were taken at approximately the same time. When you import photos, Shotwell checks when each photo was taken. It then groups the photos into events.</p>
-    
-    <p>Choose <gui>Events</gui> from the sidebar to see your photos organized by date. If you select a month or year from the sidebar, a list of events will be displayed in the main window. Double-click an event to see all the photos that were taken around that time.</p>
-    
-    <p>If a photo has no embedded date/time information, then Shotwell can't automatically
-    place it in any event.  In this case the photo will appear in the <gui>No Event</gui>
-    view accessible from the sidebar.  You can still move the photo to any event you like
-    as described below.
-    </p>
-    
-    <section>
-    <title>Renaming events</title>
-
-    <p>To give an event a name rather than referring to it by its date, select the event, click <guiseq><gui>Edit</gui><gui>Rename Event</gui></guiseq> and enter a new name. Another way of renaming an event is to double-click its name in the sidebar; type a new name and then press <key>Enter</key>.</p>
-    </section>
-
-    <section>
-    <title>Moving photos between events</title>
-
-    <p>Even though photos are initially grouped into events by their date, you can move photos between events. To do this, drag any photo to the sidebar and drop it on an event.</p>
-    </section>
-
-    <section>
-    <title>Creating and merging events</title>
-    <p>To create a new event, select the photos you would like in the new event and click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>.</p>
-    <p>To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, then, while holding down <key>Ctrl</key> click on the events you want to merge in the main window area. Finally, click <guiseq><gui>Events</gui><gui>Merge Events</gui></guiseq>.</p>
-    </section>
-
-    <section>
-    <title>Sorting events</title>
-
-    <p>Events are displayed in a tree in the sidebar, organized by the year and month of the earliest photo in the event.
-    To change the event sort order, click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select either ascending or descending.</p>
-    
-    </section>
-    
-    <section>
-    <title>Change the photo used to represent each event</title>
-
-    <p>If you select the Events item in the sidebar, you'll see a single photo which represents each event. This is called the key photo.</p>
-
-    <p>By default, Shotwell uses the first photo in each event as its key photo.
-    To use a different key photo, select the photo and choose <guiseq><gui>Photos</gui><gui>Make Key Photo for Event</gui></guiseq>.</p>
-    
-    </section>
-    
-</page>

=== removed file 'help/C/organize-flag.page'
--- help/C/organize-flag.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-flag.page	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="flag">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Flag photos to mark them as special or to work with them as a set.</desc>
-        
-        <link type="next" xref="rating"/>
-    </info>
-
-	<title>Flagging photos</title>
-
-    <p>Shotwell lets you <em>flag</em> photos.  When a photo is flagged, a small flag icon
-    appears in its upper right corner.  You can select the <gui>Flagged</gui> item in the sidebar to see
-    all photos which have been flagged.</p>
-    
-    <p>Flagging a photo marks it as special.  You can interpret this in any way you like.  For example,
-    you might flag all photos which need visual
-    adjustment, or all photos which you want to share with a friend.</p>
-    
-    <p>Flagging
-    is also useful because you can operate on all flagged photos as a set.  For example, you can
-    select the <gui>Flagged</gui> view and then upload all flagged photos to a publishing service.</p>
-    
-    <section>
-    <title>To flag or unflag a photo</title>
-    <p>
-    To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> or <gui>Unflag</gui>
-    from the context menu.  Or use the <keyseq><key>Ctrl</key><key>G</key></keyseq> or <key>/</key>
-    shortcut keys.
-    </p>
-    </section>
-    
-</page>

=== removed file 'help/C/organize-rating.page'
--- help/C/organize-rating.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-rating.page	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="rating">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Give photos a rating between 1 and 5 stars. You can reject bad photos, hiding them from view.</desc>
-        
-        <link type="next" xref="delete"/>
-    </info>
-
-	<title>Ratings</title>
-<p>You can assign each photo a rating from 1-5 stars, or may alternatively rate it as Rejected, in which case Shotwell will hide the photo by default.</p>
-
-<p>You can rate a photo or a set of photos in any of these ways:</p>
-
-<list>
-<item><p>Select the photo(s), then choose a rating from the top-level <guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu.</p></item>
-<item><p>Right-click on the photo(s), then choose a rating from the Set Rating context menu.</p></item>
-<item><p>Select the photo(s), then press any of the shortcut keys <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to clear the rating(s).</p></item>
-</list>
-
-<p>
-Normally Shotwell displays all photos except rejected photos. You can set a different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</gui></guiseq> menu - for example, you can display only photos rated with 3 stars or higher, or you can display all photos including those marked rejected. The Shotwell icon on the toolbar displays the current rating filter and can also be used to set the filter.</p>
-
-<p>Shotwell normally displays each photo's rating in its lower left-hand corner. You can turn off the display of ratings using the <guiseq><gui>View</gui><gui>Ratings</gui></guiseq> menu item.</p>
-
-<p>You can increase or decrease a photo's rating using the <guiseq><gui>Set Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts <key>&lt;</key> and <key>&gt;</key>. </p>
-</page>
-

=== removed file 'help/C/organize-remove.page'
--- help/C/organize-remove.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-remove.page	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="delete">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Remove photos from the library, or delete them from your computer entirely.</desc>
-        
-        <link type="next" xref="search"/>
-    </info>
-
-	<title>Removing and deleting photos</title>
-
-    <p>You may remove photos from your library and you may additionally delete them entirely from your hard disk.</p>
-<media type="image" src="figures/trash_process.png">Delete process</media>
-<p>This diagram shows how a photo, when deleted, is first put into Shotwell's trash. If you delete it from Shotwell's trash, it is put into your computer's trash. If you delete it from your computer's trash the photo is finally and irretrievably deleted from your computer.</p>
-<section id="delete-remove">
-	<title>Removing photos from the library</title>
-    <p>Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to Trash</gui></guiseq>.
-    (You can also press the <key>Delete</key> key.)
-    The photos will be moved from your library to Shotwell's Trash.</p>
-    <p>If you want to remove photos from Shotwell without having them pass through the trash, simply select the photos to be removed and choose <guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>.  The photo files will be left in place on disk.</p>
-</section>
-
-<section id="delete-empty">
-	<title>Emptying or restoring the trash folder</title>
-    <p>Select the Trash entry in the Sidebar and Shotwell will display all photos that have been marked for removal or deletion.  In the Trash view, the following commands are available:</p>
-    <terms>
-    <item><title>Delete</title><p>Delete the selected photos from the trash folder.</p></item>
-    <item><title>Restore</title><p>Restore the selected photos into Shotwell.</p></item>
-    <item><title>Empty trash</title><p>Delete all photos from the trash folder.</p></item>
-    </terms>
-</section>    
-    
-<section id="delete-trash">
-	<title>Deleting or emptying Trash</title>
-    <p>When you delete files from the Trash folder or empty the Trash folder, you will be given the following choices:</p>
-    <terms>
-    <item><title>Only Remove</title><p>Remove photos from the library but leave the photos in their location on the computer.</p></item>
-    <item><title>Trash file</title><p>Remove photos from the library and delete them from the computer.</p></item>
-    <item><title>Cancel</title><p>Do nothing.</p></item>
-    </terms>    
-</section>
-    
-</page>

=== removed file 'help/C/organize-search.page'
--- help/C/organize-search.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-search.page	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="search">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Find photos and videos in your collection by a variety of criteria.</desc>
-        
-        <link type="next" xref="tag"/>
-    </info>
-
-    <title>Searching</title>
-    
-    <p>
-        There are two ways to search in Shotwell: the filter toolbar, and with a saved search.  The search 
-        bar allows you to quickly search the current view for certain criteria.  Saved Searches feature
-        more complex search criteria and persist in the sidebar between sessions.
-    </p>
-    
-    <section id="searchbar">
-        <title>Search bar</title>
-            <p>
-                The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles the display of the
-                search bar.  You can also hit <keyseq><key>Ctrl</key><key>F</key></keyseq> or <key>F8</key> to
-                bring up the search bar. From this bar, you can find, show and hide photos and videos based on
-                title, tag, rating or other options.
-            </p>
-            
-            <p>
-                To begin searching, simply enter a search keyword in the text box, or click on <gui>Flagged</gui>,
-                <gui>Rating</gui> or <gui>Type</gui>. The text search matches your keywords across tag names, 
-                photo or video titles and photos' original filenames. The <gui>Flagged</gui>,
-                <gui>Rating</gui> and <gui>Type</gui> buttons allow you to filter your collection by 
-                whether photos are flagged, their current number of stars, and whether the items shown are
-                images, videos, or raw camera files, respectively. 
-            </p>
-            
-            <p>
-                Disabling the search bar or exiting Shotwell automatically resets the search bar.
-            </p>
-    </section>
-    
-    <section id="savedsearch">
-        <title>Saved search</title>
-            <p>
-                A saved search persists across Shotwell sessions, and is updated as photos and videos are added 
-                and removed from your Shotwell library.
-            </p>
-            
-            <p>
-                Create a new saved search with <guiseq><gui>Edit</gui><gui>New Search</gui></guiseq> or by hitting 
-                <keyseq><key>Ctrl</key><key>S</key></keyseq>. The dialog box allows you to enter a name for the
-                search and select whether you want to meet Any, All, or None of the criteria in the following rows.
-            </p>
-            
-            <p>
-                Each row represents a search criterion.  Use the + button to add more rows, and the - button to
-                remove a specific row.  The combo box on the left of each row selects the type of criteria.  
-                Criteria must be entered correctly before the OK button becomes available.
-            </p>
-    </section>
-
-</page>

=== removed file 'help/C/organize-tag.page'
--- help/C/organize-tag.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-tag.page	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="tag">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Organize photos by labelling them.</desc>
-        
-        <link type="seealso" xref="event"/>
-        
-        <link type="next" xref="title"/>
-    </info>
-
-	<title>Tagging photos</title>
-
-    <p>
-		You can assign one or more tags to selected photos.
-		A tag can be one or more words that you want to associate with 
-		those photos.
-	</p>
-    
-    <p>
-		To add new tags to photos, select the photos you would like to 
-		tag, then do any of the following:
-	</p>
-    
-    <list>
-		<item><p>Choose <guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq>.</p></item>
-		<item><p>Type <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p></item>
-		<item><p>Drag the selected photos and drop them on the desired tag.</p></item>
-    </list>
-     
-    <p>
-		When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or 
-		<guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq> you can type 
-		in the names of one or more tags, separated by commas.
-		Once you have created a tag, you can rename it by selecting that 
-		tag in the sidebar and choosing 
-		<guiseq><gui>Tags</gui><gui>Rename Tag "[name]"</gui></guiseq>, 
-		by rightclicking on it and choose <gui>Rename...</gui> or 
-		double-click on the tag in the sidebar.
-	</p>
-    
-    <p>
-		To change which tags are associated with a particular photo, 
-		select that photo, choose 
-		<guiseq><gui>Tags</gui><gui>Modify Tags</gui></guiseq> or 
-		right-click on a photo and select <gui>Modify Tags</gui> and 
-		edit the comma separated list.
-		To remove a tag from one or more photos, first select that tag 
-		in the sidebar, then select the photos you would like to remove, 
-		and choose 
-		<guiseq><gui>Tags</gui><gui>Remove Tag "[name]" from Photos</gui></guiseq> 
-		or right-click on the photos an select 
-		<gui>Remove Tag "[name]" from Photos</gui>.
-	</p>
-    
-    <p>
-		To delete a tag entirely, select that tag in the sidebar and choose 
-		<guiseq><gui>Tags</gui><gui>Delete Tag "[name]"</gui></guiseq> 
-		or by right-click and select <gui>Delete Tag "[name]"</gui>.
-	</p>
-
-    <p>
-		When you create a tag, it will appear in the sidebar under the 
-		Tags item, which is hidden if there are no tags. Photos can have 
-		multiple tags attached to them, and when you click on the name 
-		of a given tag in the sidebar, you will see all the photos 
-		associated with that tag.
-	</p>
-    
-    <section id="hierarchaicaltags">
-        <title>Hierarchical Tags</title>
-            <p>
-				Shotwell supports also hierarchial tags. You can 
-				rearrange your tags by drag and drop a tag onto another. 
-				To create a new subtag right-click on a tag and select 
-				<gui>New</gui>.
-			</p>
-            
-            <p>
-				Hierarchial tags can help you to sort your tag list in 
-				ways that better match how you work or think; for example,
-				you can store location tags like "Mountains" or "Beach"
-				under a parent tag "Places", which itself can be placed
-				under the tag "Summer Holidays".
-			</p>
-			
-			<p>
-				Note that deleting a parent tag will also delete its 
-				child tags.
-			</p>
-    </section>
-</page>

=== removed file 'help/C/organize-title.page'
--- help/C/organize-title.page	2011-11-28 18:01:49 +0000
+++ help/C/organize-title.page	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="title">
-
-    <info>
-        <link type="guide" xref="index#organize"/>
-        <desc>Give titles to your photos.</desc>
-        
-        <link type="next" xref="event" />
-    </info>
-
-	<title>Titles</title>
-
-<p>The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the display of titles
-beneath each photo.  By default, a photo's title is its filename.</p>
-
-<p>To change a photo's title,
-select the photo and click <guiseq><gui>Photos</gui><gui>Edit Title</gui></guiseq>, or press <key>F2</key>.</p>
-
-</page>

=== removed file 'help/C/other-files.page'
--- help/C/other-files.page	2012-04-03 01:14:09 +0000
+++ help/C/other-files.page	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="other-files">
-
-    <info>
-        <link type="guide" xref="index#other"/>
-        <desc>Keep the Shotwell library in sync with photo files on disk.</desc>
-        
-        <link type="next" xref="other-plugins"/>
-    </info>
-
-   <title>Photo files</title>
-
-    <p>
-    Every photo in the Shotwell library corresponds to a file stored on your hard disk.  Shotwell has
-    several features which help you keep the Shotwell library and files on disk in sync.
-    </p>
-    <links type="section" />
-    
-    <section id="dirpattern">
-        <title>Using a custom directory pattern</title>
-        <p>
-            Shotwell allows you to specify how it names directories in your library.  You can do this 
-            by changing the <gui>Directory Structure</gui> and <gui>Pattern</gui> settings in the 
-            <gui>Preferences</gui> dialog.  You may use a preselected pattern, or choose <gui>Custom</gui> 
-            and type in your own.
-        </p>
-
-        <p>
-            The available symbols for the directory pattern begin with a % (percent sign). The values 
-            these symbols produce are locale-dependent, so what you see on your computer may vary
-            from the examples below.
-        </p>
-
-        <table frame="all" rules="rowgroups">
-            <tbody>
-                <tr>
-                    <td><p> </p></td> <td><p><em>Symbol</em></p></td> <td><p><em>Meaning</em></p></td> <td><p><em>Example</em></p></td>
-                </tr>
-            </tbody>
-            <tbody>
-            <tr>
-                <td><p> </p></td><td><p> %Y </p></td><td><p> Year: full </p></td><td><p> 2011 </p></td>
-            </tr>
-            <tr>
-                <td><p> </p></td><td><p> %y </p></td><td><p> Year: two digit </p></td><td><p> 11 </p></td>
-            </tr>
-            <tr>
-                <td><p> </p></td><td><p> %d </p></td><td><p> Day of the month with leading zero </p></td><td><p> 03 </p></td>
-            </tr>
-            <tr>
-                <td><p> </p></td><td><p> %A </p></td><td><p> Day name: full </p></td><td><p> Wednesday </p></td>
-            </tr>
-            <tr>
-                <td><p> </p></td><td><p> %a </p></td><td><p> Day name: abbreviated </p></td><td><p> Wed </p></td>
-            </tr>
-            <tr>
-                <td><p> </p></td><td><p> %m </p></td><td><p> Month number with leading zero </p></td><td><p> 02 </p></td>
-            </tr>
-            <tr><td><p> </p></td><td><p> %b </p></td><td><p> Month name: abbreviated </p></td><td><p> Feb 
-            
-            </p></td></tr><tr><td><p> </p></td><td><p> %B </p></td><td><p> Month name: full </p></td><td><p> February 
-            </p></td></tr><tr><td><p> </p></td><td><p> %I </p></td><td><p> Hour: 12 hour format </p></td><td><p> 05 
-            </p></td></tr><tr><td><p> </p></td><td><p> %H </p></td><td><p> Hour: 24 hour format </p></td><td><p> 17 
-            
-            </p></td></tr><tr><td><p> </p></td><td><p> %M </p></td><td><p> Minute </p></td><td><p> 16 
-            </p></td></tr><tr><td><p> </p></td><td><p> %S </p></td><td><p> Second </p></td><td><p> 30 
-            </p></td></tr><tr><td><p> </p></td><td><p> %p </p></td><td><p> AM or PM </p></td><td><p> PM </p></td></tr>
-            </tbody>
-        </table>
-
-        <p>
-            There are other symbols available; please check the manual for strftime by running 
-            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
-        </p>
-    </section>
-
-    <section id="automatic-import">
-       <title>Automatically importing photos</title>
-       
-       <p>Shotwell can automatically import new photos which appear in the library directory.
-       (The library directory is usually the <file>Pictures</file> directory in your home directory;
-       you can change its location in in the <gui>Preferences</gui> window.)
-       </p>
-       
-       <p>To enable auto-import,
-       check the box <gui>Watch library directory for new files</gui> in
-       the <gui>Preferences</gui> window.</p>
-       
-       <note style="advanced"><p>Shotwell can also follow symbolic links inside automatically-imported directories.</p></note>
-
-    </section>
-
-    <section id="automatic-rename">
-       <title>Automatically renaming imported photos to lowercase</title>
-       
-       <p>
-       Shotwell can automatically change the filenames of imported photos
-       to lowercase.  To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>,
-       and in the <gui>Preferences</gui> window, check the <gui>Rename imported files to lowercase</gui>
-       box.
-       </p>
-    
-    </section>
-    
-    <section id="writing-metadata">
-       <title>Writing metadata on the fly</title>
-       
-       <p>By default, Shotwell does not modify photo files, even when you edit photos or change their
-       tags or titles.  Shotwell records these changes in its own database only.</p>
-       
-       <p>To change this behavior, you can enable the checkbox
-       <gui>Write tags, titles and other metadata to photo files</gui>
-       in the <gui>Preferences</gui> dialog.  When this option is enabled, Shotwell will write
-       the following metadata to most photo files whenever you change it in Shotwell:</p>
-       
-       <list>
-       <item><p>titles</p></item>
-       <item><p>tags</p></item>
-       <item><p>ratings</p></item>
-       <item><p>rotation information</p></item>
-       <item><p>time/date</p></item>
-       </list>
-       
-       <p>Shotwell stores this information in photo files in EXIF, IPTC and/or XMP format.  Note
-       that Shotwell can write only to photo files in JPEG, PNG and TIFF format, not to BMP photos, RAW photos
-       or to video files.  
-       </p>
-    
-    </section>
-    
-    <section id="runtime-monitoring">
-    <title>Runtime monitoring</title>
-    
-    <p>While Shotwell is running, it notices changes made to any photo file externally.
-    When a photo file changes, Shotwell rereads the file and updates your view of the
-    photo and metadata.</p>
-    
-    <p>Note that Shotwell checks all photo files for changes at startup, but only photo files contained in
-    the library directory are monitored in real time after startup.  We hope to remove this limitation
-    in a further release.</p>
-
-    </section>
-    
-</page>
-

=== removed file 'help/C/other-missing.page'
--- help/C/other-missing.page	2011-08-22 20:44:14 +0000
+++ help/C/other-missing.page	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="other-missing">
-
-    <info>
-        <link type="guide" xref="index#other"/>
-        <desc>If Shotwell can't find a photo in your library, it marks it as missing.</desc>
-        
-        <link type="next" xref="other-multiple"/>
-    </info>
-
-	<title>Missing photos</title>
-
-<p>Each time Shotwell starts up, it scans your photo library to verify that all photo files still exist on your hard drive. If Shotwell finds that any photo files are missing, it will not display them in the normal Photos, Events and Tags views, but will instead show them in a separate Missing Files view which will appear in the sidebar.</p>
-
-<p>If you no longer want the missing files to be part of your Shotwell collection (perhaps because you deleted them), go to the Missing Files view, select the photos and then click <gui>Remove From Library</gui>.</p>
-
-<p>If you have photos on a removable disk, such as a CD or USB flash drive, and <link xref="index#import">import</link> them into Shotwell <em>without</em> copying the photos to your computer, they will show up as missing files if you then disconnect the removable disk. See <link xref="import-file"/> to learn how to copy files from removable disks onto your computer.</p>
-
-<p>If any missing photo files become available again, Shotwell will notice this the next time it starts. The photos will once again appear in the Photos, Events and Tags views.</p>
-
-</page>
-

=== removed file 'help/C/other-multiple.page'
--- help/C/other-multiple.page	2011-08-22 20:44:14 +0000
+++ help/C/other-multiple.page	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="other-multiple">
-
-    <info>
-        <link type="guide" xref="index#other"/>
-        <desc>You can open Shotwell with a different photo library by using the command line.</desc>
-        
-        <link type="next" xref="other-files"/>
-    </info>
-
-	<title>Multiple libraries</title>
-
-<p>Shotwell normally stores its database and photo thumbnails in the directory <file>~/.shotwell</file> . This directory does not hold photos, but the database in this directory contains a list of all the photos in the Shotwell library.</p>
-
-<p>As an advanced feature, it's possible for you to have multiple Shotwell libraries, each of which has its own set of photos. Each library needs its own database directory. To launch Shotwell with an alternate library, specify an alternate database directory on the command line as follows:</p>
-
-<screen>
-shotwell -d [library-directory]
-</screen>
-
-</page>
-

=== removed file 'help/C/other-plugins.page'
--- help/C/other-plugins.page	2012-04-03 01:14:09 +0000
+++ help/C/other-plugins.page	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="other-plugins">
-
-    <info>
-        <link type="guide" xref="index#other"/>
-        <desc>Extend Shotwell's functionality dynamically.</desc>
-        
-        <link type="next" xref="other-missing"/>
-    </info>
-
-	<title>Plugins</title>
-        <p>
-            Shotwell can be used with <em>plugins</em>, which are companion shared libraries that can
-            add support for new publishing destinations or new slideshow transitions.
-        </p>
-        
-        <p>
-            To see a list of installed plugins, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>,
-            and in the <gui>Preferences</gui> window, click on the <gui>Plugins</gui> tab.  You'll see a list
-            of currently-installed plugins, each with a checkbox by it, and you may enable or disable each by
-            selecting or deselecting the checkbox by its name.
-        </p>
-        
-        <note style="advanced"><p>Full documentation on how to develop new plugins is available at 
-        <link href="http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins">http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins</link></p></note>
-    
-</page>
-

=== removed file 'help/C/raw.page'
--- help/C/raw.page	2011-09-08 00:16:45 +0000
+++ help/C/raw.page	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="other-raw">
-
-    <info>
-        <link type="guide" xref="index#other"/>
-        <desc>More about RAW support in Shotwell.</desc>
-        
-        <link type="next" xref="running" />
-    </info>
-   
-    <title>RAW support in Shotwell</title> 
-    <p>Some cameras have the ability to store data directly off the sensor
-    and into a file that contains extra color information; this is commonly
-    referred to as 'RAW' or 'camera RAW', and Shotwell supports these files
-    as well.</p>
-    
-    <p>Since RAW photographs normally cannot be displayed directly, but must
-    be first developed - that is, have their extra information interpreted and
-    readied for displaying - most cameras will either embed a JPEG inside a
-    RAW-format file, or produce a JPEG alongside the RAW file at the time the
-    snapshot is taken.  The latter is referred to throughout this document as
-    RAW+JPEG.  If you import a RAW+JPEG pair, Shotwell will
-    keep them paired and treat them as one item in your library.
-    </p>
-    
-    <p>When you import a RAW file, you can choose to either use the camera's
-    internally-developed JPEG or Shotwell's by selecting 
-    <guiseq><gui>Photos</gui><gui>Developer</gui></guiseq> in the menus.
-    </p>
-
-    <note>
-        <p>
-        Changing between developers will cause all edits made to a photograph
-        to be discarded.
-        </p>
-    </note>
-    
-    <p>
-    In order to publish or use a RAW photograph in most other software, it has to be
-    exported first.  Shotwell can export your RAW photos in JPEG, PNG, TIFF 
-    or BMP format, and, when publishing, will internally export a JPEG version
-    for you and publish that.  
-    </p>  
-    
-</page>

=== removed file 'help/C/running.page'
--- help/C/running.page	2011-08-22 20:44:14 +0000
+++ help/C/running.page	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="running">
-
-    <info>
-        <link type="guide" xref="index"/>
-        <desc>Find Shotwell in the Applications menu, or have it start automatically when you plug in a camera.</desc>
-        
-        <link type="seealso" xref="other-multiple" />
-        
-        <link type="next" xref="formats" />
-    </info>
-
-	<title>Running Shotwell</title>
-
-<p>Once installed, Shotwell is available in your <gui>Applications</gui> menu under <gui>Graphics</gui> or <gui>Photography</gui>.</p>
-
-<p>Shotwell may also be executed automatically when a camera is plugged in to your computer. To check
-that your system is set up to run Shotwell when a camera is detected, go to
-<guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> in any
-Nautilus (file browser) window and choose the <gui>Media</gui> tab.  You'll see a dropdown box
-entitled <gui>Photos:</gui> which lets you choose Shotwell as your photo handling application.</p>
-
-<note style="advanced">
- <p>Shotwell may also be executed directly from its build directory, although this is only recommended for testing out Shotwell or for developers.</p>
-</note>
-   
-</page>
-

=== removed file 'help/C/share-background.page'
--- help/C/share-background.page	2011-08-22 20:44:14 +0000
+++ help/C/share-background.page	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-background">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Set your desktop background to a single photo or to a slideshow of photos.</desc>
-        
-        <link type="next" xref="share-slideshow" />
-    </info>
-
-	<title>Set a desktop background or slideshow</title>
-
-    <p>To set a single photo as your desktop background, select the photo and choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>.</p>
-    
-    <p>You can also set your background to a slideshow of photos.  To do this, select the photos for
-    the slideshow and choose <guiseq><gui>File</gui><gui>Set as Desktop Slideshow</gui></guiseq>.
-    Shotwell will prompt you for a slideshow delay, which can be any interval up to one day in length.
-    The background slideshow will proceed even when Shotwell is not running.
-    </p>
-    
-</page>
-

=== removed file 'help/C/share-export.page'
--- help/C/share-export.page	2013-01-11 19:55:46 +0000
+++ help/C/share-export.page	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-export">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Copy photos out of Shotwell so you can put them somewhere else.</desc>
-        
-        <link type="next" xref="share-print" />
-    </info>
-
-	<title>Exporting photos</title>
-
-<p>To export photos from Shotwell via drag and drop, drag the photos from Shotwell onto
-a file manager window or your desktop. The new files will be full-sized copies of
-the photos in your library.</p>
-
-<p>
-Alternatively, select a set of photos and choose the <guiseq><gui>File</gui><gui>Export</gui></guiseq> command or press <keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting you fine-tune the size and dimensions of your photo files.
-A window will appear allowing you to make several choices:
-</p>
-
-<list>
-<item><p>A format for export.  
-</p>
-<list>
-<item><p>Choose <gui>Unmodified</gui> to export photos in their original format without
-any edits made in Shotwell.  RAW photos will be exported in their original RAW format.</p></item>
-<item><p>Choose <gui>Current</gui> to export photos including edits made in Shotwell.  RAW photos will be
-exported in JPEG format if you have edited them in Shotwell, and otherwise in their original RAW format.</p></item>
-<item><p>
-Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be used for exporting.  Any edits made in
-Shotwell will be included, and Shotwell will convert photos to the destination format.
-</p></item>
-</list>
-</item>
-<item><p>The image quality for exporting (Low, Medium, High, or Maximum).</p></item>
-<item><p>A scaling constraint (which means how Shotwell will decide to scale the photos down), and the desired pixel size.</p></item>
-<item><p>The option whether you like to export metadatas such as tags or ratings. This can help to save your privacy if you have geolocation tags or tags which shouldn't be seen by anyone.</p></item>
-</list>
-
-<p>If selected, Shotwell will write tags, titles, and other metadata to the new files.</p>
-
-</page>
-

=== removed file 'help/C/share-print.page'
--- help/C/share-print.page	2011-08-22 20:44:14 +0000
+++ help/C/share-print.page	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-print">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Click <guiseq><gui>File</gui><gui>Print</gui></guiseq>. For more printing options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog.</desc>
-        
-        <link type="next" xref="share-upload" />
-    </info>
-
-	<title>Printing</title>
-
-    <p>To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>.</p>
-     
-    <p>
-    Shotwell can also print multiple images in one page; to do this, select multiple images, 
-    choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, and in the <gui>Print</gui> dialog, 
-    choose the <gui>Image Settings</gui> tab. In <gui>Image Settings</gui>, choose one of the 
-    multiple-image-per-page options under <gui>Autosize</gui>.
-    </p>
-
-    <p>If you would like to set formatting, paper size, and orientation options, choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to printing.</p>
-</page>

=== removed file 'help/C/share-send.page'
--- help/C/share-send.page	2011-08-22 20:44:14 +0000
+++ help/C/share-send.page	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-send">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Send photos via email, instant messaging or in other ways.</desc>
-        
-        <link type="next" xref="share-background" />
-    </info>
-
-	<title>Sending photos</title>
-
-    <p>Shotwell can send photos using the GNOME desktop's Send To mechanism, which
-    lets you send photos via email, instant messaging or in other ways.</p>
-    <p>To send photos, select them in Shotwell and choose
-    <guiseq><gui>File</gui><gui>Send To...</gui></guiseq>,
-    or right-click the photos and choose <gui>Send To...</gui> from the context menu.
-    A <gui>Send To</gui> dialog box will appear which lets you choose a mechanism for
-    sending the files (such as email or instant messaging) and a destination.  You can
-    optionally choose to send the files in a compressed format.
-    </p>
-    
-</page>
-

=== removed file 'help/C/share-slideshow.page'
--- help/C/share-slideshow.page	2011-08-22 20:44:14 +0000
+++ help/C/share-slideshow.page	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-slideshow">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Watch a slideshow of your photos.</desc>
-        
-        <link type="next" xref="share-export" />
-    </info>
-
-	<title>Slideshows</title>
-
-    <p>To see a sideshow of any collection in Shotwell, navigate to that collection and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press <key>F5</key>.</p>
-    
-    <p>You can change some settings in a running slideshow:</p>
-    
-    <list>
-    <item><p>The duration how long an image should be shown: 1 - 30 seconds</p></item>
-    <item><p>You can select different transition effects.</p></item>
-    <item><p>The time for each transition effect: 0.1 - 1.0 seconds</p></item>
-    </list>
-</page>

=== removed file 'help/C/share-upload.page'
--- help/C/share-upload.page	2012-11-26 20:28:41 +0000
+++ help/C/share-upload.page	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="share-upload">
-
-    <info>
-        <link type="guide" xref="index#share"/>
-        <desc>Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites.</desc>
-        
-        <link type="next" xref="share-send" />
-    </info>
-
-	<title>Publishing to the Web</title>
-
-    <p>Through the use of <link xref="other-plugins">plugins</link>, Shotwell can publish photos 
-    and videos to the following services, each of which requires an account:</p>
-    
-    <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (videos only)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, a photo site popular in Russia (photos only)</p></item>
-    <item><p>Any site running the <link href="http://piwigo.org">Piwigo</link> photo gallery software (photos only)</p></item>
-    </list>
-    
-    <p>To publish selected photos in a collection, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and
-    click on the <gui>Plugins</gui> tab to enable the plugin for the service you want to publish to.  Next, choose,
-     <guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>.
-    You will see a dialog that lets you select a publishing service.  You will then need to log in or create an account.</p>
-    
-    <p>Publishing to Facebook requires you to grant certain permissions to the Shotwell Connect Facebook application.
-    You only need to grant these permissions once, when you first associate Shotwell Connect with your Facebook account.
-</p>
-    
-    <p>Similarly, publishing to Flickr requires you to log in and permit Shotwell Connect to access your account.</p>
-    
-    <p>If you have a Google account, but have not yet used Picasa Web Albums, you will need to log in to Picasa using a browser once before you can publish to this service.</p>
-</page>

=== removed file 'help/C/view-displaying.page'
--- help/C/view-displaying.page	2011-08-22 20:44:14 +0000
+++ help/C/view-displaying.page	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="view-view">
-
-    <info>
-        <link type="guide" xref="index#view"/>
-        <desc>Learn about different ways of viewing your photos: in a grid, filling the main window, or filling the whole screen.</desc>
-        
-        <link type="next" xref="view-sidebar"/>
-    </info>
-
-	<title>Photo views</title>
-
-<p>When you select any collection in the sidebar, Shotwell displays all photos in the collection in the main window area.  At the bottom right is a slider which adjusts the viewing size of the thumbnails. You may also adjust the thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) or by pressing <key>Ctrl</key> while moving your mouse scroll wheel.</p>
-
-<p>You can view a photo full-window by double-clicking on it. From there you may move to other photos in the collection with the Back and Forward buttons. To return to the collection, double-click on the photo or press <key>Esc</key>.</p>
-
-<p>When viewing a photo in full-window mode, the slider on the toolbar controls zoom. You can pan around by grabbing and dragging anywhere on the photo. You can also zoom using your scroll wheel or by pressing the following keyboard shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, <keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen pixels).</p>
-
-<p>Shotwell offers a fullscreen mode to display photos. Choose <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</key>. To see the fullscreen toolbar, move your mouse to the bottom of the screen. The toolbar offers buttons to move through the collection, to pin the toolbar down (so it isn't hidden when you move the mouse away), and to leave fullscreen view.</p>
-
-<section>
-<title>Viewing videos</title>
-<p>When you double-click a video, Shotwell will launch an external video player to play the video.  It's not currently
-possible to display a video in full-window mode in Shotwell or to play the video within Shotwell itself.</p>
-</section>
-    
-</page>

=== removed file 'help/C/view-information.page'
--- help/C/view-information.page	2011-08-22 20:44:14 +0000
+++ help/C/view-information.page	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="view-information">
-
-    <info>
-        <link type="guide" xref="index#view"/>
-        <desc>View more detailed information about photos, like the exposure mode used by the camera.</desc>
-        
-        <link type="next" xref="view-view"/>
-    </info>
-
-	<title>Basic and extended information</title>
-
-<p>The Basic Information pane appears at the bottom of the sidebar, and displays a brief summary of the photos you've selected. If no photos are selected, it displays a summary of the entire collection. You can toggle the display of this pane using the <guiseq><gui>View</gui><gui>Basic Information</gui></guiseq> command.</p>
-
-<p>The floating Extended Information window displays more information about the selected photo.  The <guiseq><gui>View</gui><gui>Extended Information</gui></guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></keyseq> toggles the display of this window.</p>
-
-</page>
-

=== removed file 'help/C/view-sidebar.page'
--- help/C/view-sidebar.page	2012-10-24 00:35:07 +0000
+++ help/C/view-sidebar.page	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="view-sidebar">
-
-    <info>
-        <link type="guide" xref="index#view"/>
-        <desc>The sidebar on the left of the window lists various views of your library.</desc>
-        
-        <link type="seealso" xref="event"/>
-        <link type="seealso" xref="tag"/>
-        <link type="seealso" xref="flag"/>
-        <link type="seealso" xref="search#savedsearch"/>
-        <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
-        <link type="seealso" xref="import-memorycard"/>
-        <link type="seealso" xref="import-camera"/>
-        
-        <link type="next" xref="view-information"/>
-    </info>
-
-	<title>The sidebar</title>
-
-<p>The sidebar on the left side of the Shotwell window lists various views of your library. Although you may see the same photo in multiple views, it's only stored once on your hard drive.</p>
-
-<p>The <gui>Last Import</gui> view lists your last imported photos no matter if they are imported from F-Spot, your camera, a memory card or the hard disk.</p>
-
-<p>The <gui>Flagged</gui> lists all photos you had previous flagged.</p>
-
-<p>The <gui>Saved Search</gui> allows you to sort your library by many criteria.</p>
-
-<p>The <gui>Events</gui> folder lists all events in your library.  An event is a group of photos that were taken at approximately the same time.</p>
-
-<p>The <gui>Tags</gui> folder lists all tags you've assigned to photos.  Photos can have multiple tags attached to them. When you click on the name of a tag in the sidebar, you will see all the photos associated with that tag.</p>
-
-</page>
-

=== removed file 'help/Makefile.am'
--- help/Makefile.am	2014-01-16 09:32:34 +0000
+++ help/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# Dummy Makefile.am to allow the help to be translated on l10n.gnome.org.
-# This isn't actually processed by automake.
-
-DOC_ID = shotwell
-
-DOC_PAGES = \
-	edit-adjustments.page \
-	edit-crop.page \
-	edit-enhance.page \
-	edit-external.page \
-	edit-nondestructive.page \
-	edit-redeye.page \
-	edit-rotate.page \
-	edit-straighten.page \
-	edit-time-date.page \
-	edit-undo.page \
-	formats.page \
-	import-camera.page \
-	import-file.page \
-	import-f-spot.page \
-	import-memorycard.page \
-	index.page \
-	organize-event.page \
-	organize-flag.page \
-	organize-rating.page \
-	organize-remove.page \
-	organize-search.page \
-	organize-tag.page \
-	organize-title.page \
-	other-files.page \
-	other-missing.page \
-	other-multiple.page \
-	other-plugins.page \
-	raw.page \
-	running.page \
-	share-background.page \
-	share-export.page \
-	share-print.page \
-	share-send.page \
-	share-slideshow.page \
-	share-upload.page \
-	view-displaying.page \
-	view-information.page \
-	view-sidebar.page
-
-DOC_LINGUAS = es

=== removed directory 'help/es'
=== removed file 'help/es/es.po'
--- help/es/es.po	2014-01-16 09:32:34 +0000
+++ help/es/es.po	1970-01-01 00:00:00 +0000
@@ -1,2192 +0,0 @@
-# Spanish translation for shotwell.
-# Copyright (C) 2014 shotwell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the shotwell package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Daniel Mustieles <[e-mail]>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2014-01-15 20:18+0000\n"
-"PO-Revision-Date: 2014-01-16 10:30+0100\n"
-"Last-Translator: Daniel Mustieles <[e-mail]>\n"
-"Language-Team: Español <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
-
-#: C/view-sidebar.page:7(desc)
-msgid ""
-"The sidebar on the left of the window lists various views of your library."
-msgstr ""
-
-#: C/view-sidebar.page:21(title)
-msgid "The sidebar"
-msgstr ""
-
-#: C/view-sidebar.page:23(p)
-msgid ""
-"The sidebar on the left side of the Shotwell window lists various views of "
-"your library. Although you may see the same photo in multiple views, it's "
-"only stored once on your hard drive."
-msgstr ""
-
-#: C/view-sidebar.page:25(p)
-msgid ""
-"The <gui>Last Import</gui> view lists your last imported photos no matter if "
-"they are imported from F-Spot, your camera, a memory card or the hard disk."
-msgstr ""
-
-#: C/view-sidebar.page:27(p)
-msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
-msgstr ""
-
-#: C/view-sidebar.page:29(p)
-msgid ""
-"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
-msgstr ""
-
-#: C/view-sidebar.page:31(p)
-msgid ""
-"The <gui>Events</gui> folder lists all events in your library. An event is a "
-"group of photos that were taken at approximately the same time."
-msgstr ""
-
-#: C/view-sidebar.page:33(p)
-msgid ""
-"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
-"can have multiple tags attached to them. When you click on the name of a tag "
-"in the sidebar, you will see all the photos associated with that tag."
-msgstr ""
-
-#: C/view-information.page:7(desc)
-msgid ""
-"View more detailed information about photos, like the exposure mode used by "
-"the camera."
-msgstr ""
-
-#: C/view-information.page:12(title)
-msgid "Basic and extended information"
-msgstr ""
-
-#: C/view-information.page:14(p)
-msgid ""
-"The Basic Information pane appears at the bottom of the sidebar, and "
-"displays a brief summary of the photos you've selected. If no photos are "
-"selected, it displays a summary of the entire collection. You can toggle the "
-"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
-"Information</gui></guiseq> command."
-msgstr ""
-
-#: C/view-information.page:16(p)
-msgid ""
-"The floating Extended Information window displays more information about the "
-"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
-"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
-"keyseq> toggles the display of this window."
-msgstr ""
-
-#: C/view-displaying.page:7(desc)
-msgid ""
-"Learn about different ways of viewing your photos: in a grid, filling the "
-"main window, or filling the whole screen."
-msgstr ""
-
-#: C/view-displaying.page:12(title)
-msgid "Photo views"
-msgstr ""
-
-#: C/view-displaying.page:14(p)
-msgid ""
-"When you select any collection in the sidebar, Shotwell displays all photos "
-"in the collection in the main window area. At the bottom right is a slider "
-"which adjusts the viewing size of the thumbnails. You may also adjust the "
-"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
-"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
-msgstr ""
-
-#: C/view-displaying.page:16(p)
-msgid ""
-"You can view a photo full-window by double-clicking on it. From there you "
-"may move to other photos in the collection with the Back and Forward "
-"buttons. To return to the collection, double-click on the photo or press "
-"<key>Esc</key>."
-msgstr ""
-
-#: C/view-displaying.page:18(p)
-msgid ""
-"When viewing a photo in full-window mode, the slider on the toolbar controls "
-"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
-"can also zoom using your scroll wheel or by pressing the following keyboard "
-"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
-"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
-"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
-"pixels)."
-msgstr ""
-
-#: C/view-displaying.page:20(p)
-msgid ""
-"Shotwell offers a fullscreen mode to display photos. Choose "
-"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
-"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
-"screen. The toolbar offers buttons to move through the collection, to pin "
-"the toolbar down (so it isn't hidden when you move the mouse away), and to "
-"leave fullscreen view."
-msgstr ""
-
-#: C/view-displaying.page:23(title)
-msgid "Viewing videos"
-msgstr ""
-
-#: C/view-displaying.page:24(p)
-msgid ""
-"When you double-click a video, Shotwell will launch an external video player "
-"to play the video. It's not currently possible to display a video in full-"
-"window mode in Shotwell or to play the video within Shotwell itself."
-msgstr ""
-
-#: C/share-upload.page:7(desc)
-msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
-msgstr ""
-
-#: C/share-upload.page:12(title)
-msgid "Publishing to the Web"
-msgstr ""
-
-#: C/share-upload.page:14(p)
-msgid ""
-"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
-"publish photos and videos to the following services, each of which requires "
-"an account:"
-msgstr ""
-
-#: C/share-upload.page:18(link)
-msgid "Facebook"
-msgstr ""
-
-#: C/share-upload.page:19(link)
-msgid "Flickr"
-msgstr ""
-
-#: C/share-upload.page:20(p)
-msgid ""
-"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
-"<link href=\"http://plus.google.com\">Google+</link>"
-msgstr ""
-
-#: C/share-upload.page:21(p)
-msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
-msgstr ""
-
-#: C/share-upload.page:22(p)
-msgid ""
-"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
-"popular in Russia (photos only)"
-msgstr ""
-
-#: C/share-upload.page:23(p)
-msgid ""
-"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
-"gallery software (photos only)"
-msgstr ""
-
-#: C/share-upload.page:26(p)
-msgid ""
-"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
-"to enable the plugin for the service you want to publish to. Next, choose, "
-"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
-"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
-"will see a dialog that lets you select a publishing service. You will then "
-"need to log in or create an account."
-msgstr ""
-
-#: C/share-upload.page:31(p)
-msgid ""
-"Publishing to Facebook requires you to grant certain permissions to the "
-"Shotwell Connect Facebook application. You only need to grant these "
-"permissions once, when you first associate Shotwell Connect with your "
-"Facebook account."
-msgstr ""
-
-#: C/share-upload.page:35(p)
-msgid ""
-"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
-"Connect to access your account."
-msgstr ""
-
-#: C/share-upload.page:37(p)
-msgid ""
-"If you have a Google account, but have not yet used Picasa Web Albums, you "
-"will need to log in to Picasa using a browser once before you can publish to "
-"this service."
-msgstr ""
-
-#: C/share-slideshow.page:7(desc)
-msgid "Watch a slideshow of your photos."
-msgstr ""
-
-#: C/share-slideshow.page:12(title)
-msgid "Slideshows"
-msgstr ""
-
-#: C/share-slideshow.page:14(p)
-msgid ""
-"To see a sideshow of any collection in Shotwell, navigate to that collection "
-"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
-"<key>F5</key>."
-msgstr ""
-
-#: C/share-slideshow.page:16(p)
-msgid "You can change some settings in a running slideshow:"
-msgstr ""
-
-#: C/share-slideshow.page:19(p)
-msgid "The duration how long an image should be shown: 1 - 30 seconds"
-msgstr ""
-
-#: C/share-slideshow.page:20(p)
-msgid "You can select different transition effects."
-msgstr ""
-
-#: C/share-slideshow.page:21(p)
-msgid "The time for each transition effect: 0.1 - 1.0 seconds"
-msgstr ""
-
-#: C/share-send.page:7(desc)
-msgid "Send photos via email, instant messaging or in other ways."
-msgstr ""
-
-#: C/share-send.page:12(title)
-msgid "Sending photos"
-msgstr ""
-
-#: C/share-send.page:14(p)
-msgid ""
-"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
-"lets you send photos via email, instant messaging or in other ways."
-msgstr ""
-
-#: C/share-send.page:16(p)
-msgid ""
-"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
-"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
-"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
-"will appear which lets you choose a mechanism for sending the files (such as "
-"email or instant messaging) and a destination. You can optionally choose to "
-"send the files in a compressed format."
-msgstr ""
-
-#: C/share-print.page:7(desc)
-msgid ""
-"Click <guiseq><gui>File</gui><gui>Print</gui></guiseq>. For more printing "
-"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
-msgstr ""
-
-#: C/share-print.page:12(title)
-msgid "Printing"
-msgstr ""
-
-#: C/share-print.page:14(p)
-msgid ""
-"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</"
-"gui></guiseq>."
-msgstr ""
-
-#: C/share-print.page:16(p)
-msgid ""
-"Shotwell can also print multiple images in one page; to do this, select "
-"multiple images, choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, "
-"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
-"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
-"options under <gui>Autosize</gui>."
-msgstr ""
-
-#: C/share-print.page:23(p)
-msgid ""
-"If you would like to set formatting, paper size, and orientation options, "
-"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
-"printing."
-msgstr ""
-
-#: C/share-export.page:7(desc)
-msgid "Copy photos out of Shotwell so you can put them somewhere else."
-msgstr ""
-
-#: C/share-export.page:12(title)
-msgid "Exporting photos"
-msgstr ""
-
-#: C/share-export.page:14(p)
-msgid ""
-"To export photos from Shotwell via drag and drop, drag the photos from "
-"Shotwell onto a file manager window or your desktop. The new files will be "
-"full-sized copies of the photos in your library."
-msgstr ""
-
-#: C/share-export.page:18(p)
-msgid ""
-"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
-"gui><gui>Export</gui></guiseq> command or press <keyseq><key>Shift</"
-"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
-"you fine-tune the size and dimensions of your photo files. A window will "
-"appear allowing you to make several choices:"
-msgstr ""
-
-#: C/share-export.page:24(p)
-msgid "A format for export."
-msgstr ""
-
-#: C/share-export.page:27(p)
-msgid ""
-"Choose <gui>Unmodified</gui> to export photos in their original format "
-"without any edits made in Shotwell. RAW photos will be exported in their "
-"original RAW format."
-msgstr ""
-
-#: C/share-export.page:29(p)
-msgid ""
-"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
-"RAW photos will be exported in JPEG format if you have edited them in "
-"Shotwell, and otherwise in their original RAW format."
-msgstr ""
-
-#: C/share-export.page:31(p)
-msgid ""
-"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
-"used for exporting. Any edits made in Shotwell will be included, and "
-"Shotwell will convert photos to the destination format."
-msgstr ""
-
-#: C/share-export.page:37(p)
-msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
-msgstr ""
-
-#: C/share-export.page:38(p)
-msgid ""
-"A scaling constraint (which means how Shotwell will decide to scale the "
-"photos down), and the desired pixel size."
-msgstr ""
-
-#: C/share-export.page:39(p)
-msgid ""
-"The option whether you like to export metadatas such as tags or ratings. "
-"This can help to save your privacy if you have geolocation tags or tags "
-"which shouldn't be seen by anyone."
-msgstr ""
-
-#: C/share-export.page:42(p)
-msgid ""
-"If selected, Shotwell will write tags, titles, and other metadata to the new "
-"files."
-msgstr ""
-
-#: C/share-background.page:7(desc)
-msgid ""
-"Set your desktop background to a single photo or to a slideshow of photos."
-msgstr ""
-
-#: C/share-background.page:12(title)
-msgid "Set a desktop background or slideshow"
-msgstr ""
-
-#: C/share-background.page:14(p)
-msgid ""
-"To set a single photo as your desktop background, select the photo and "
-"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
-msgstr ""
-
-#: C/share-background.page:16(p)
-msgid ""
-"You can also set your background to a slideshow of photos. To do this, "
-"select the photos for the slideshow and choose <guiseq><gui>File</"
-"gui><gui>Set as Desktop Slideshow</gui></guiseq>. Shotwell will prompt you "
-"for a slideshow delay, which can be any interval up to one day in length. "
-"The background slideshow will proceed even when Shotwell is not running."
-msgstr ""
-
-#: C/running.page:7(desc)
-msgid ""
-"Find Shotwell in the Applications menu, or have it start automatically when "
-"you plug in a camera."
-msgstr ""
-
-#: C/running.page:14(title)
-msgid "Running Shotwell"
-msgstr ""
-
-#: C/running.page:16(p)
-msgid ""
-"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
-"under <gui>Graphics</gui> or <gui>Photography</gui>."
-msgstr ""
-
-#: C/running.page:18(p)
-msgid ""
-"Shotwell may also be executed automatically when a camera is plugged in to "
-"your computer. To check that your system is set up to run Shotwell when a "
-"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
-"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
-"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
-"you choose Shotwell as your photo handling application."
-msgstr ""
-
-#: C/running.page:25(p)
-msgid ""
-"Shotwell may also be executed directly from its build directory, although "
-"this is only recommended for testing out Shotwell or for developers."
-msgstr ""
-
-#: C/raw.page:7(desc)
-msgid "More about RAW support in Shotwell."
-msgstr ""
-
-#: C/raw.page:12(title)
-msgid "RAW support in Shotwell"
-msgstr ""
-
-#: C/raw.page:13(p)
-msgid ""
-"Some cameras have the ability to store data directly off the sensor and into "
-"a file that contains extra color information; this is commonly referred to "
-"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
-msgstr ""
-
-#: C/raw.page:18(p)
-msgid ""
-"Since RAW photographs normally cannot be displayed directly, but must be "
-"first developed - that is, have their extra information interpreted and "
-"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
-"format file, or produce a JPEG alongside the RAW file at the time the "
-"snapshot is taken. The latter is referred to throughout this document as RAW"
-"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
-"treat them as one item in your library."
-msgstr ""
-
-#: C/raw.page:27(p)
-msgid ""
-"When you import a RAW file, you can choose to either use the camera's "
-"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
-"gui><gui>Developer</gui></guiseq> in the menus."
-msgstr ""
-
-#: C/raw.page:33(p)
-msgid ""
-"Changing between developers will cause all edits made to a photograph to be "
-"discarded."
-msgstr ""
-
-#: C/raw.page:39(p)
-msgid ""
-"In order to publish or use a RAW photograph in most other software, it has "
-"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
-"or BMP format, and, when publishing, will internally export a JPEG version "
-"for you and publish that."
-msgstr ""
-
-#: C/other-plugins.page:7(desc)
-msgid "Extend Shotwell's functionality dynamically."
-msgstr ""
-
-#: C/other-plugins.page:12(title)
-msgid "Plugins"
-msgstr ""
-
-#: C/other-plugins.page:13(p)
-msgid ""
-"Shotwell can be used with <em>plugins</em>, which are companion shared "
-"libraries that can add support for new publishing destinations or new "
-"slideshow transitions."
-msgstr ""
-
-#: C/other-plugins.page:18(p)
-msgid ""
-"To see a list of installed plugins, choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
-"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
-"installed plugins, each with a checkbox by it, and you may enable or disable "
-"each by selecting or deselecting the checkbox by its name."
-msgstr ""
-
-#: C/other-plugins.page:25(p)
-msgid ""
-"Full documentation on how to develop new plugins is available at <link href="
-"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
-"\">http://redmine.yorba.org/projects/shotwell/wiki/"
-"ShotwellArchWritingPlugins</link>"
-msgstr ""
-
-#: C/other-multiple.page:7(desc)
-msgid ""
-"You can open Shotwell with a different photo library by using the command "
-"line."
-msgstr ""
-
-#: C/other-multiple.page:12(title)
-msgid "Multiple libraries"
-msgstr ""
-
-#: C/other-multiple.page:14(p)
-msgid ""
-"Shotwell normally stores its database and photo thumbnails in the directory "
-"<file>~/.shotwell</file> . This directory does not hold photos, but the "
-"database in this directory contains a list of all the photos in the Shotwell "
-"library."
-msgstr ""
-
-#: C/other-multiple.page:16(p)
-msgid ""
-"As an advanced feature, it's possible for you to have multiple Shotwell "
-"libraries, each of which has its own set of photos. Each library needs its "
-"own database directory. To launch Shotwell with an alternate library, "
-"specify an alternate database directory on the command line as follows:"
-msgstr ""
-
-#: C/other-multiple.page:18(screen)
-#, no-wrap
-msgid ""
-"\n"
-"shotwell -d [library-directory]\n"
-msgstr ""
-
-#: C/other-missing.page:7(desc)
-msgid "If Shotwell can't find a photo in your library, it marks it as missing."
-msgstr ""
-
-#: C/other-missing.page:12(title)
-msgid "Missing photos"
-msgstr ""
-
-#: C/other-missing.page:14(p)
-msgid ""
-"Each time Shotwell starts up, it scans your photo library to verify that all "
-"photo files still exist on your hard drive. If Shotwell finds that any photo "
-"files are missing, it will not display them in the normal Photos, Events and "
-"Tags views, but will instead show them in a separate Missing Files view "
-"which will appear in the sidebar."
-msgstr ""
-
-#: C/other-missing.page:16(p)
-msgid ""
-"If you no longer want the missing files to be part of your Shotwell "
-"collection (perhaps because you deleted them), go to the Missing Files view, "
-"select the photos and then click <gui>Remove From Library</gui>."
-msgstr ""
-
-#: C/other-missing.page:18(p)
-msgid ""
-"If you have photos on a removable disk, such as a CD or USB flash drive, and "
-"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
-"em> copying the photos to your computer, they will show up as missing files "
-"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
-"to learn how to copy files from removable disks onto your computer."
-msgstr ""
-
-#: C/other-missing.page:20(p)
-msgid ""
-"If any missing photo files become available again, Shotwell will notice this "
-"the next time it starts. The photos will once again appear in the Photos, "
-"Events and Tags views."
-msgstr ""
-
-#: C/other-files.page:7(desc)
-msgid "Keep the Shotwell library in sync with photo files on disk."
-msgstr ""
-
-#: C/other-files.page:12(title)
-msgid "Photo files"
-msgstr ""
-
-#: C/other-files.page:14(p)
-msgid ""
-"Every photo in the Shotwell library corresponds to a file stored on your "
-"hard disk. Shotwell has several features which help you keep the Shotwell "
-"library and files on disk in sync."
-msgstr ""
-
-#: C/other-files.page:21(title)
-msgid "Using a custom directory pattern"
-msgstr ""
-
-#: C/other-files.page:22(p)
-msgid ""
-"Shotwell allows you to specify how it names directories in your library. You "
-"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
-"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
-"preselected pattern, or choose <gui>Custom</gui> and type in your own."
-msgstr ""
-
-#: C/other-files.page:29(p)
-msgid ""
-"The available symbols for the directory pattern begin with a % (percent "
-"sign). The values these symbols produce are locale-dependent, so what you "
-"see on your computer may vary from the examples below."
-msgstr ""
-
-#: C/other-files.page:38(em)
-msgid "Symbol"
-msgstr ""
-
-#: C/other-files.page:38(em)
-msgid "Meaning"
-msgstr ""
-
-#: C/other-files.page:38(em)
-msgid "Example"
-msgstr ""
-
-#: C/other-files.page:43(p)
-msgid "%Y"
-msgstr "%Y"
-
-#: C/other-files.page:43(p)
-msgid "Year: full"
-msgstr ""
-
-#: C/other-files.page:43(p)
-msgid "2011"
-msgstr "2011"
-
-#: C/other-files.page:46(p)
-msgid "%y"
-msgstr "%y"
-
-#: C/other-files.page:46(p)
-msgid "Year: two digit"
-msgstr ""
-
-#: C/other-files.page:46(p)
-msgid "11"
-msgstr "11"
-
-#: C/other-files.page:49(p)
-msgid "%d"
-msgstr "%d"
-
-#: C/other-files.page:49(p)
-msgid "Day of the month with leading zero"
-msgstr ""
-
-#: C/other-files.page:49(p)
-msgid "03"
-msgstr "03"
-
-#: C/other-files.page:52(p)
-msgid "%A"
-msgstr "%A"
-
-#: C/other-files.page:52(p)
-msgid "Day name: full"
-msgstr ""
-
-#: C/other-files.page:52(p)
-msgid "Wednesday"
-msgstr ""
-
-#: C/other-files.page:55(p)
-msgid "%a"
-msgstr "%a"
-
-#: C/other-files.page:55(p)
-msgid "Day name: abbreviated"
-msgstr ""
-
-#: C/other-files.page:55(p)
-msgid "Wed"
-msgstr ""
-
-#: C/other-files.page:58(p)
-msgid "%m"
-msgstr "%m"
-
-#: C/other-files.page:58(p)
-msgid "Month number with leading zero"
-msgstr ""
-
-#: C/other-files.page:58(p)
-msgid "02"
-msgstr "02"
-
-#: C/other-files.page:60(p)
-msgid "%b"
-msgstr "%b"
-
-#: C/other-files.page:60(p)
-msgid "Month name: abbreviated"
-msgstr ""
-
-#: C/other-files.page:60(p)
-msgid "Feb"
-msgstr "Feb"
-
-#: C/other-files.page:62(p)
-msgid "%B"
-msgstr "%B"
-
-#: C/other-files.page:62(p)
-msgid "Month name: full"
-msgstr ""
-
-#: C/other-files.page:62(p)
-msgid "February"
-msgstr ""
-
-#: C/other-files.page:63(p)
-msgid "%I"
-msgstr "%I"
-
-#: C/other-files.page:63(p)
-msgid "Hour: 12 hour format"
-msgstr ""
-
-#: C/other-files.page:63(p)
-msgid "05"
-msgstr "05"
-
-#: C/other-files.page:64(p)
-msgid "%H"
-msgstr "%H"
-
-#: C/other-files.page:64(p)
-msgid "Hour: 24 hour format"
-msgstr ""
-
-#: C/other-files.page:64(p)
-msgid "17"
-msgstr "17"
-
-#: C/other-files.page:66(p)
-msgid "%M"
-msgstr "%M"
-
-#: C/other-files.page:66(p)
-msgid "Minute"
-msgstr ""
-
-#: C/other-files.page:66(p)
-msgid "16"
-msgstr "16"
-
-#: C/other-files.page:67(p)
-msgid "%S"
-msgstr "%S"
-
-#: C/other-files.page:67(p)
-msgid "Second"
-msgstr ""
-
-#: C/other-files.page:67(p)
-msgid "30"
-msgstr "30"
-
-#: C/other-files.page:68(p)
-msgid "%p"
-msgstr "%p"
-
-#: C/other-files.page:68(p)
-msgid "AM or PM"
-msgstr "AM o PM"
-
-#: C/other-files.page:68(p)
-msgid "PM"
-msgstr "PM"
-
-#: C/other-files.page:72(p)
-msgid ""
-"There are other symbols available; please check the manual for strftime by "
-"running the command <cmd>man strftime</cmd> if you need one that isn't "
-"listed here."
-msgstr ""
-
-#: C/other-files.page:79(title)
-msgid "Automatically importing photos"
-msgstr ""
-
-#: C/other-files.page:81(p)
-msgid ""
-"Shotwell can automatically import new photos which appear in the library "
-"directory. (The library directory is usually the <file>Pictures</file> "
-"directory in your home directory; you can change its location in in the "
-"<gui>Preferences</gui> window.)"
-msgstr ""
-
-#: C/other-files.page:86(p)
-msgid ""
-"To enable auto-import, check the box <gui>Watch library directory for new "
-"files</gui> in the <gui>Preferences</gui> window."
-msgstr ""
-
-#: C/other-files.page:90(p)
-msgid ""
-"Shotwell can also follow symbolic links inside automatically-imported "
-"directories."
-msgstr ""
-
-#: C/other-files.page:95(title)
-msgid "Automatically renaming imported photos to lowercase"
-msgstr ""
-
-#: C/other-files.page:97(p)
-msgid ""
-"Shotwell can automatically change the filenames of imported photos to "
-"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
-"<gui>Rename imported files to lowercase</gui> box."
-msgstr ""
-
-#: C/other-files.page:107(title)
-msgid "Writing metadata on the fly"
-msgstr ""
-
-#: C/other-files.page:109(p)
-msgid ""
-"By default, Shotwell does not modify photo files, even when you edit photos "
-"or change their tags or titles. Shotwell records these changes in its own "
-"database only."
-msgstr ""
-
-#: C/other-files.page:112(p)
-msgid ""
-"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
-"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
-"dialog. When this option is enabled, Shotwell will write the following "
-"metadata to most photo files whenever you change it in Shotwell:"
-msgstr ""
-
-#: C/other-files.page:118(p)
-msgid "titles"
-msgstr ""
-
-#: C/other-files.page:119(p)
-msgid "tags"
-msgstr ""
-
-#: C/other-files.page:120(p)
-msgid "ratings"
-msgstr ""
-
-#: C/other-files.page:121(p)
-msgid "rotation information"
-msgstr ""
-
-#: C/other-files.page:122(p)
-msgid "time/date"
-msgstr ""
-
-#: C/other-files.page:125(p)
-msgid ""
-"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
-"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
-"TIFF format, not to BMP photos, RAW photos or to video files."
-msgstr ""
-
-#: C/other-files.page:133(title)
-msgid "Runtime monitoring"
-msgstr ""
-
-#: C/other-files.page:135(p)
-msgid ""
-"While Shotwell is running, it notices changes made to any photo file "
-"externally. When a photo file changes, Shotwell rereads the file and updates "
-"your view of the photo and metadata."
-msgstr ""
-
-#: C/other-files.page:139(p)
-msgid ""
-"Note that Shotwell checks all photo files for changes at startup, but only "
-"photo files contained in the library directory are monitored in real time "
-"after startup. We hope to remove this limitation in a further release."
-msgstr ""
-
-#: C/organize-title.page:7(desc)
-msgid "Give titles to your photos."
-msgstr ""
-
-#: C/organize-title.page:12(title)
-msgid "Titles"
-msgstr ""
-
-#: C/organize-title.page:14(p)
-msgid ""
-"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
-"display of titles beneath each photo. By default, a photo's title is its "
-"filename."
-msgstr ""
-
-#: C/organize-title.page:17(p)
-msgid ""
-"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
-"gui><gui>Edit Title</gui></guiseq>, or press <key>F2</key>."
-msgstr ""
-
-#: C/organize-tag.page:7(desc)
-msgid "Organize photos by labelling them."
-msgstr ""
-
-#: C/organize-tag.page:14(title)
-msgid "Tagging photos"
-msgstr ""
-
-#: C/organize-tag.page:16(p)
-msgid ""
-"You can assign one or more tags to selected photos. A tag can be one or more "
-"words that you want to associate with those photos."
-msgstr ""
-
-#: C/organize-tag.page:22(p)
-msgid ""
-"To add new tags to photos, select the photos you would like to tag, then do "
-"any of the following:"
-msgstr ""
-
-#: C/organize-tag.page:28(p)
-msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq>."
-msgstr ""
-
-#: C/organize-tag.page:29(p)
-msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
-msgstr ""
-
-#: C/organize-tag.page:30(p)
-msgid "Drag the selected photos and drop them on the desired tag."
-msgstr ""
-
-#: C/organize-tag.page:33(p)
-msgid ""
-"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
-"<guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq> you can type in the "
-"names of one or more tags, separated by commas. Once you have created a tag, "
-"you can rename it by selecting that tag in the sidebar and choosing "
-"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"</gui></guiseq>, by "
-"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
-"tag in the sidebar."
-msgstr ""
-
-#: C/organize-tag.page:44(p)
-msgid ""
-"To change which tags are associated with a particular photo, select that "
-"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags</gui></guiseq> or "
-"right-click on a photo and select <gui>Modify Tags</gui> and edit the comma "
-"separated list. To remove a tag from one or more photos, first select that "
-"tag in the sidebar, then select the photos you would like to remove, and "
-"choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</gui></"
-"guiseq> or right-click on the photos an select <gui>Remove Tag \"[name]\" "
-"from Photos</gui>."
-msgstr ""
-
-#: C/organize-tag.page:58(p)
-msgid ""
-"To delete a tag entirely, select that tag in the sidebar and choose "
-"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
-"click and select <gui>Delete Tag \"[name]\"</gui>."
-msgstr ""
-
-#: C/organize-tag.page:64(p)
-msgid ""
-"When you create a tag, it will appear in the sidebar under the Tags item, "
-"which is hidden if there are no tags. Photos can have multiple tags attached "
-"to them, and when you click on the name of a given tag in the sidebar, you "
-"will see all the photos associated with that tag."
-msgstr ""
-
-#: C/organize-tag.page:73(title)
-msgid "Hierarchical Tags"
-msgstr ""
-
-#: C/organize-tag.page:74(p)
-msgid ""
-"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
-"and drop a tag onto another. To create a new subtag right-click on a tag and "
-"select <gui>New</gui>."
-msgstr ""
-
-#: C/organize-tag.page:81(p)
-msgid ""
-"Hierarchial tags can help you to sort your tag list in ways that better "
-"match how you work or think; for example, you can store location tags like "
-"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
-"be placed under the tag \"Summer Holidays\"."
-msgstr ""
-
-#: C/organize-tag.page:89(p)
-msgid "Note that deleting a parent tag will also delete its child tags."
-msgstr ""
-
-#: C/organize-search.page:7(desc)
-msgid "Find photos and videos in your collection by a variety of criteria."
-msgstr ""
-
-#: C/organize-search.page:12(title)
-msgid "Searching"
-msgstr ""
-
-#: C/organize-search.page:14(p)
-msgid ""
-"There are two ways to search in Shotwell: the filter toolbar, and with a "
-"saved search. The search bar allows you to quickly search the current view "
-"for certain criteria. Saved Searches feature more complex search criteria "
-"and persist in the sidebar between sessions."
-msgstr ""
-
-#: C/organize-search.page:21(title)
-msgid "Search bar"
-msgstr ""
-
-#: C/organize-search.page:22(p)
-msgid ""
-"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
-"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
-"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
-"this bar, you can find, show and hide photos and videos based on title, tag, "
-"rating or other options."
-msgstr ""
-
-#: C/organize-search.page:29(p)
-msgid ""
-"To begin searching, simply enter a search keyword in the text box, or click "
-"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
-"matches your keywords across tag names, photo or video titles and photos' "
-"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
-"gui> buttons allow you to filter your collection by whether photos are "
-"flagged, their current number of stars, and whether the items shown are "
-"images, videos, or raw camera files, respectively."