Merge lp:~pantheon-photos/pantheon-photos/rebrand into lp:~pantheon-photos/pantheon-photos/trunk

[Rico Tzschichholz]

[Rico Tzschichholz (ricotz)]

Go ahead whoever likes to look into it further

[Cody Garver (codygarver)]

I'm sure there's much more to be done but what's most obvious to my tired eyes:

Need to change the icons in the manager and viewer .desktop files to the new ones Dan just added to the icon theme

Need to delete the old shotwell icons and make sure they're no longer referenced anywhere in the code

review: Needs Fixing

[lp:~pantheon-photos/pantheon-photos/rebrand]

2509. By Rico Tzschichholz on 2014-02-24

Rebrand to Pantheon Photos (pantheon-photos)

[Tristan Petersen (tristang4)]

I took a quick look last night, and I'll look into it a little further soon, but for right now I noticed some human facing text reading "Pantheon Photos". Aren't we going to do human facing text as "Photos" and anything in the code/backend pantheon photos (or pantheon-photos) etc?

review: Needs Fixing

[Danielle Foré (danrabbit)]

Yeah, I agree with Tristan. User-facing text (like the app name in the .desktop) should just read "Photos"

I've added Jim as a requested review just in the spirit of making sure we don't overstep ourselves since this looks like a pretty thorough find/replace.

[Jim Nelson (yorba-jim)]

I was out most of last week and am just now catching up.

Some thoughts:

* First, someone should really go over this with a finetooth comb. One of the changes is in the README specifying the mailing list is at <email address hidden>.

* I understand Shotwell -> Pantheon Photos (or Photos) in user-facing text (i.e. strings in code, README, etc.) but I question changing the names of source and data files (i.e. shotwell-thumbnailer.vala -> pantheon-photos-thumbailer.vala). I appreciate wanting to make this project your own, but this will make life more difficult down the road if you want to merge in changes from upstream. The names of these files will never been seen by the end-user unless they're looking at a debug log.

* Is there some reason the .doap file is removed?

* Please be careful when modifying copyright information. The help/es.po file author assigned copyright to Shotwell -- you can't change that, you need to get the translator's permission first.

* Just so everyone's aware: by changing things like the path to the database and thumbnails, GSettings schema, etc., you break a natural upgrade path for previous Shotwell users.

* The misc/shotwell.convert file is for moving users still on GConf to GSettings. I doubt there's any benefit for changing the paths in that file since Pantheon Photos will never store its settings in GConf. However, if you do follow my advice in the previous point regarding GSettings, there is benefit in keeping this file around (although it's getting slimmer with each passing day).

* The plugin ID's are better set to "org.elementaryos.pantheon-photos.XXX". Again, I kind of question the benefit of this change, as if the user ever winds up in a situation where Shotwell and Photos are installed at the same time, it's possible the user will see duplicate plugins in their list.

* This patch mechanically alters foreign language translation strings. "Shotwell" is never translated, as far as I know, even in Asian languages. "Pantheon Photos" might be, especially the second word.

I've only looked over this patch once, there may be more things I missed.

[Rico Tzschichholz (ricotz)]

review: Disapprove

Unmerged revisions

2509. By Rico Tzschichholz on 2014-02-24

Rebrand to Pantheon Photos (pantheon-photos)

=== 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
-*~
-

=== modified file 'COPYING'
--- COPYING	2010-12-03 17:19:53 +0000
+++ COPYING	2014-02-24 07:36:30 +0000
@@ -3,7 +3,7 @@
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.
 
-Some of Shotwell's icons are copyright their respective authors:
+Some of Pantheon Photos's icons are copyright their respective authors:
 
     * Human
       https://launchpad.net/human-icon-theme

=== modified file 'INSTALL'
--- INSTALL	2013-01-21 21:16:09 +0000
+++ INSTALL	2014-02-24 07:36:30 +0000
@@ -1,25 +1,25 @@
 
-    Shotwell Installation
-    ---------------------
+    Pantheon Photos Installation
+    ----------------------------
 
-    To build and install Shotwell, type the following commands:
+    To build and install Pantheon Photos, type the following commands:
 
     $ ./configure
     $ make
     $ make install
 
-    * By default, Shotwell will install under /usr/local.  The configure script
+    * By default, Pantheon Photos will install under /usr/local.  The configure script
       can customize the prefix directory.  Run ./configure --help for
       instructions and other installation options.
   
     * You may need to execute "make install" as root (i.e. sudo make install)
       if installing to system directories.
 
-    * If you wish to try Shotwell before installing it, you may execute it
+    * If you wish to try Pantheon Photos before installing it, you may execute it
       directly from its build directory.  Note that certain desktop integration
       (such as being listed in an application menu) requires full installation.
 
-    Once installed, Shotwell will be available on your desktop Applications
+    Once installed, Pantheon Photos will be available on your desktop Applications
     menu under Graphics or Photography.
 
 

=== modified file 'Makefile'
--- Makefile	2014-02-04 22:37:33 +0000
+++ Makefile	2014-02-24 07:36:30 +0000
@@ -1,6 +1,6 @@
-PROGRAM = shotwell
-PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
-PROGRAM_MIGRATOR = shotwell-settings-migrator
+PROGRAM = pantheon-photos
+PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
+PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
 
 VERSION = 0.15.1+trunk
 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
@@ -27,7 +27,7 @@
 
 -include configure.mk
 ifndef LIBEXECDIR
-LIBEXECDIR=$(PREFIX)/libexec/shotwell
+LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
 endif
 
 CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
@@ -112,7 +112,7 @@
 	Upgrades.vala 
 
 THUMBNAILER_SRC_FILES = \
-	shotwell-video-thumbnailer.vala
+	pantheon-photos-video-thumbnailer.vala
 
 VAPI_FILES = \
 	ExtendedPosix.vapi \
@@ -152,8 +152,8 @@
 	search_bar.ui \
 	search_sidebar_context.ui \
 	set_background_dialog.glade \
-	shotwell.glade \
-	shotwell.xml \
+	pantheon-photos.glade \
+	pantheon-photos.xml \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
@@ -161,12 +161,12 @@
 	trash.ui 
 
 SYS_INTEGRATION_FILES = \
-	shotwell.appdata.xml \
-	shotwell.desktop.head \
-	shotwell-viewer.desktop.head \
-	org.yorba.shotwell.gschema.xml \
-	org.yorba.shotwell-extras.gschema.xml \
-	shotwell.convert
+	pantheon-photos.appdata.xml \
+	pantheon-photos.desktop.head \
+	pantheon-photos-viewer.desktop.head \
+	org.pantheon.photos.gschema.xml \
+	org.pantheon.photos-extras.gschema.xml \
+	pantheon-photos.convert
 
 SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
 
@@ -211,11 +211,11 @@
 	publish.png \
 	redeye.png \
 	rejected.svg \
-	shotwell-16.svg \
-	shotwell-24.svg \
-	shotwell.ico \
-	shotwell-street.jpg \
-	shotwell.svg \
+	pantheon-photos-16.svg \
+	pantheon-photos-24.svg \
+	pantheon-photos.ico \
+	pantheon-photos-street.jpg \
+	pantheon-photos.svg \
 	sprocket.png \
 	straighten.svg \
 	three-star-filter-plus.svg \
@@ -276,7 +276,7 @@
 	crop_thirds.jpg \
 	editing_overview.png \
 	edit_toolbar.png \
-	shotwell_logo.png \
+	pantheon_photos_logo.png \
 	trash_process.png
 
 VAPI_DIRS = \
@@ -361,15 +361,15 @@
 BUILD_DIR=src
 endif
 
-DESKTOP_APP_SHORT_NAME="Shotwell"
-DESKTOP_APP_FULL_NAME="Shotwell Photo Manager"
+DESKTOP_APP_SHORT_NAME="Pantheon Photos"
+DESKTOP_APP_FULL_NAME="Pantheon Photos 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="Shotwell"
-DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer"
+DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Pantheon Photos"
+DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Pantheon Photos Photo Viewer"
 DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
-TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
+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)
@@ -410,14 +410,14 @@
 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_INPUT := pantheon-photos-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) \
+	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/pantheon-photos.py $(UNIT_RESOURCES) $(UNIT_MKS) \
 	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
 	vapi/gphoto-2.5/libgphoto2.vapi vapi/gphoto-2.4/libgphoto2.vapi \
 	$(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN)
@@ -468,7 +468,7 @@
 
 $(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`)
+		msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/pantheon-photos.mo po/$(po).po`)
 	@touch $(LANG_STAMP)
 
 clean:
@@ -505,45 +505,45 @@
 	cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
 	rm -f $(DIST_TAR_XZ)
 
-misc/shotwell.desktop: misc/shotwell.desktop.head $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell.desktop.head misc/shotwell.desktop
+misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head $(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/shotwell.desktop ; \
+		LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
+		>> misc/pantheon-photos.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
-		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
+		gettext --domain=pantheon-photos $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
 		echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
+		--domain=pantheon-photos $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
 		echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;) 
+		--domain=pantheon-photos $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;) 
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
-	if test -s misc/shotwell.desktop.errors; then \
-		echo -e "\nThe file misc/shotwell.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell.desktop.errors for details."; \
+	@ 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/shotwell.desktop.errors; \
+	else rm -f misc/pantheon-photos.desktop.errors; \
 	fi
 endif
 	
-misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
+misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head $(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 $(DESKTOP_APP_FULL_NAME)` \
+		LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
 		echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
+		--domain=pantheon-photos $(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/shotwell-viewer.desktop ;)
+		--domain=pantheon-photos $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
-	if test -s misc/shotwell-viewer.desktop.errors; then \
-		echo -e S"\nThe file misc/shotwell-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell-viewer.desktop.errors for details."; \
+	@ 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/shotwell-viewer.desktop.errors; \
+	else rm -f misc/pantheon-photos-viewer.desktop.errors; \
 	fi
 endif
 
 .PHONY: desktop
-desktop: misc/shotwell.desktop misc/shotwell-viewer.desktop
+desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
 
 .PHONY: dist
 dist:
@@ -565,64 +565,64 @@
 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
-	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
+	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
-	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+	$(INSTALL_DATA) icons/pantheon-photos.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
-	$(INSTALL_DATA) icons/shotwell-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
+	$(INSTALL_DATA) icons/pantheon-photos-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
-	$(INSTALL_DATA) icons/shotwell-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
+	$(INSTALL_DATA) icons/pantheon-photos-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
 	mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(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/shotwell.convert $(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/shotwell/ui
-	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
+	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/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell.appdata.xml $(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
+	$(INSTALL_DATA) apport/pantheon-photos.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
 endif
 ifndef DISABLE_HELP_INSTALL
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
-	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
+	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/shotwell.mo`)
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
-	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.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)/shotwell/plugins/builtin
+	$(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)/shotwell/plugins/builtin
+	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef EXTRA_PLUGINS_RC
-	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 endif
 endif
 ifdef INSTALL_HEADERS
-	mkdir -p $(DESTDIR)$(PREFIX)/include/shotwell/plugins
-	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/shotwell/plugins
+	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
@@ -637,37 +637,37 @@
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
-	rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
+	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/shotwell
+	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
+	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/pantheon-photos.py
 endif
-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
-	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(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/shotwell
+	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.yorba.shotwell.gschema.xml
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
+	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/shotwell.convert
+	rm -f $(DESTDIR)/usr/share/GConf/gsettings/pantheon-photos.convert
 endif
 
 $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
@@ -729,7 +729,7 @@
 docs:
 # valadoc complains if the directory already exists
 	@rm -rf docs
-	valadoc --directory=docs --package-name=shotwell-plugin-dev --package-version=$(VERSION) --verbose \
+	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)) \
@@ -747,10 +747,10 @@
 
 .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 )
+	@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Pantheon Photos 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 'Pantheon Photos 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 ),)
+		@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Pantheon Photos cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
 
 
 
@@ -762,7 +762,7 @@
 	@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 )
+	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Pantheon Photos. ' ; 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 )
+	@ 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 Pantheon Photos. ' ; exit 1 )
 endif

=== modified file 'README'
--- README	2013-01-21 21:16:09 +0000
+++ README	2014-02-24 07:36:30 +0000
@@ -1,16 +1,16 @@
 
-    Shotwell Photo Manager
+    Pantheon Photos Photo Manager
     ----------------------
     
   * Introduction
     
-    Shotwell is a digital photo manager designed for the GNOME desktop
+    Pantheon Photos 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 them to share with others.
     
-    Visit http://www.yorba.org/shotwell to read about the current state of
-    Shotwell's development and to make sure you're running the latest version.
+    Visit http://www.yorba.org/pantheon-photos to read about the current state of
+    Pantheon Photos's development and to make sure you're running the latest version.
     
 
   * Installation & Licensing
@@ -24,36 +24,36 @@
     camera, and from the File menu.
     
     * Drag-and-drop: Simply drag photos from your file manager and drop them
-    onto the Shotwell window.  You may drag files or directories.  The photos
+    onto the Pantheon Photos window.  You may drag files or directories.  The photos
     will be imported into the library.
     
-    * Camera: Connect your digital camera to your computer.  Shotwell will 
-    detect it and list it in the sidebar.  When you select the camera, Shotwell 
+    * Camera: Connect your digital camera to your computer.  Pantheon Photos will 
+    detect it and list it in the sidebar.  When you select the camera, Pantheon Photos 
     will load previews of each photo.  You may choose specific photos to 
     import or to import them all.
     
-    Shotwell uses gPhoto to communicate with digital cameras.  If your camera 
-    does not appear in Shotwell's sidebar or there is a problem importing
+    Pantheon Photos uses gPhoto to communicate with digital cameras.  If your camera 
+    does not appear in Pantheon Photos's sidebar or there is a problem importing
     photos, visit http://www.gphoto.org to see if it is supported.
     
     * File menu: Select File -> Import From Folder ... and select a directory
-    from the chooser dialog box.  Shotwell will scan the directory and all
+    from the chooser dialog box.  Pantheon Photos will scan the directory and all
     sub-directories for photo files and automatically import them.
     
-    Once your photos are in Shotwell's library, you can view, edit, and export
-    them.  More features are planned, so check http://www.yorba.org/shotwell
+    Once your photos are in Pantheon Photos's library, you can view, edit, and export
+    them.  More features are planned, so check http://www.yorba.org/pantheon-photos
     regularly for updates.
 
     
   * Contacting Yorba
     
     Yorba:                      http://www.yorba.org
-    Shotwell project page:      http://www.yorba.org/shotwell
-    Shotwell documentation:     http://www.yorba.org/shotwell/help
+    Pantheon Photos project page:      http://www.yorba.org/pantheon-photos
+    Pantheon Photos documentation:     http://www.yorba.org/pantheon-photos/help
     
-    We also encourage you to join the Shotwell mailing list.  Send an email
+    We also encourage you to join the Pantheon Photos mailing list.  Send an email
     with a subject: line of "subscribe" (no quotes) to
-    [e-mail].
+    [e-mail].
     
     
     

=== modified file 'THANKS'
--- THANKS	2013-10-29 00:56:02 +0000
+++ THANKS	2014-02-24 07:36:30 +0000
@@ -1,4 +1,4 @@
-The Shotwell team would like to thank the following contributors:
+The Pantheon Photos team would like to thank the following contributors:
 
 Valentín Barros <[e-mail]>
 Bruno Girin <[e-mail]>

=== renamed file 'apport/shotwell.py' => 'apport/pantheon-photos.py'
--- apport/shotwell.py	2010-06-09 17:39:28 +0000
+++ apport/pantheon-photos.py	2014-02-24 07:36:30 +0000
@@ -2,6 +2,6 @@
 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')
+    log_file = os.path.expanduser('~/.cache/pantheon-photos/pantheon-photos.log')
+    apport.hookutils.attach_file_if_exists(report, log_file, 'pantheon-photos.log')
 

=== modified file 'configure'
--- configure	2013-09-19 20:47:45 +0000
+++ configure	2014-02-24 07:36:30 +0000
@@ -26,8 +26,8 @@
                             [lib]
     --libdir LIBNAME        Equivalent to --lib=LIBNAME
     --libexec=LIBEXECDIR    Set utility executable to LIBEXECDIR
-                            (usually 'PREFIX/libexec/shotwell').
-                            [PREFIX/libexec/shotwell]
+                            (usually 'PREFIX/libexec/pantheon-photos').
+                            [PREFIX/libexec/pantheon-photos]
     --libexec LIBEXECDIR    Equivalent to --libexec=LIBEXECDIR
 
     --define=SYMBOL         Define a symbol for the Vala compiler.

=== modified file 'help/C/edit-crop.page'
--- help/C/edit-crop.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-crop.page	2014-02-24 07:36:30 +0000
@@ -26,11 +26,11 @@
   <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>
+  <p>When you're happy with your crop outline, press the <gui>Apply</gui> button. Pantheon Photos 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>
+  <p>If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Pantheon Photos will return to the photo's previous crop dimensions.</p>
  </item>
 </steps>
 

=== modified file 'help/C/edit-enhance.page'
--- help/C/edit-enhance.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-enhance.page	2014-02-24 07:36:30 +0000
@@ -4,7 +4,7 @@
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Let Shotwell improve the brightness and contrast of a photo automatically.</desc>
+        <desc>Let Pantheon Photos improve the brightness and contrast of a photo automatically.</desc>
         
         <link type="seealso" xref="edit-adjustments" />
         

=== modified file 'help/C/edit-external.page'
--- help/C/edit-external.page	2011-10-13 23:58:57 +0000
+++ help/C/edit-external.page	2014-02-24 07:36:30 +0000
@@ -29,7 +29,7 @@
     </p>
 
     <p>
-        When you complete your edits and save the file, Shotwell will detect the changes and 
+        When you complete your edits and save the file, Pantheon Photos 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.
@@ -42,12 +42,12 @@
     <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 
+            JPEG or PNG, Pantheon Photos 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 
+            If you want to work within the resulting image within Pantheon Photos, you'll need to 
             import it yourself.
         </p>
     </note>    

=== modified file 'help/C/edit-nondestructive.page'
--- help/C/edit-nondestructive.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-nondestructive.page	2014-02-24 07:36:30 +0000
@@ -4,18 +4,18 @@
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Shotwell is a non-destructive photo editor - it does not modify your original photos.</desc>
+        <desc>Pantheon Photos 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>Pantheon Photos 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. Pantheon Photos 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.
+<p>Note that Pantheon Photos 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>

=== modified 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	2014-02-24 07:36:30 +0000
@@ -15,7 +15,7 @@
 
 <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>
+<p>By default, the time and date are only changed inside Pantheon Photos. 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>
 

=== modified file 'help/C/edit-undo.page'
--- help/C/edit-undo.page	2011-08-22 20:44:14 +0000
+++ help/C/edit-undo.page	2014-02-24 07:36:30 +0000
@@ -13,7 +13,7 @@
 
 	<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>Because Pantheon Photos 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>
 

=== renamed file 'help/C/figures/shotwell_logo.png' => 'help/C/figures/pantheon_photos_logo.png'
=== modified file 'help/C/formats.page'
--- help/C/formats.page	2011-09-02 19:02:26 +0000
+++ help/C/formats.page	2014-02-24 07:36:30 +0000
@@ -4,31 +4,31 @@
 
     <info>
         <link type="guide" xref="index"/>
-        <desc>Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video files.</desc>
+        <desc>Pantheon Photos 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
+   <p>Pantheon Photos supports JPEG, PNG, TIFF, BMP and <link type="guide" xref="other-raw">RAW</link> photo files. Pantheon Photos does not yet support other graphics format such as GIF.</p>
+
+<p>Pantheon Photos'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 Pantheon Photos, 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>
+<p>Pantheon Photos also supports video files in any format supported by the GStreamer media library on the system where
+Pantheon Photos 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,
+<p>Pantheon Photos supports both photos and videos, but for simplicity, this documentation uses just the term "photos"
+in most places.  Many operations in Pantheon Photos apply to both photos and videos, however.  In particular, events,
 flagging, rating, tagging, and publishing work both for photos and for videos.</p>
 
 </page>

=== modified file 'help/C/import-camera.page'
--- help/C/import-camera.page	2011-08-22 20:44:14 +0000
+++ help/C/import-camera.page	2014-02-24 07:36:30 +0000
@@ -16,7 +16,7 @@
    <steps>
     <item>
      <p>Connect the camera to your computer and switch it on.
-    Shotwell will detect it and list it in the sidebar.</p>
+    Pantheon Photos 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>

=== modified 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	2014-02-24 07:36:30 +0000
@@ -4,7 +4,7 @@
 
     <info>
         <link type="guide" xref="index#import"/>
-        <desc>Shotwell can import all your photos and tags from the F-Spot photo manager.</desc>
+        <desc>Pantheon Photos can import all your photos and tags from the F-Spot photo manager.</desc>
         
         <link type="next" xref="import-camera"/>
     </info>
@@ -17,6 +17,6 @@
     <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.
+    <p>Pantheon Photos 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>

=== modified file 'help/C/import-file.page'
--- help/C/import-file.page	2011-09-08 00:16:45 +0000
+++ help/C/import-file.page	2014-02-24 07:36:30 +0000
@@ -11,13 +11,13 @@
 
 	<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>To import photo files from your hard disk into Pantheon Photos, just drag them from your file browser into the Pantheon Photos 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>Pantheon Photos 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>If you hold down <key>Ctrl</key> while dragging photos in, Pantheon Photos 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, Pantheon Photos 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>
 

=== modified file 'help/C/import-memorycard.page'
--- help/C/import-memorycard.page	2011-08-22 20:44:14 +0000
+++ help/C/import-memorycard.page	2014-02-24 07:36:30 +0000
@@ -25,7 +25,7 @@
  </item>
 </steps>
 
-<p>Shotwell can import photos from any memory card that is compatible with your card reader.</p>
+<p>Pantheon Photos 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>
 

=== modified file 'help/C/index.page'
--- help/C/index.page	2010-12-23 01:39:32 +0000
+++ help/C/index.page	2014-02-24 07:36:30 +0000
@@ -3,8 +3,8 @@
       id="index">
 
 	<info>
-		<title type="link">Shotwell</title>
-     	<title type="text">Shotwell</title>
+		<title type="link">Pantheon Photos</title>
+     	<title type="text">Pantheon Photos</title>
 		<credit type="author">
 		    <name>Jim Nelson</name>
 		    <email>[e-mail]</email>
@@ -20,7 +20,7 @@
 	</info>
 
 
-	<title><media type="image" src="figures/shotwell_logo.png"></media>Shotwell Photo Manager</title>
+	<title><media type="image" src="figures/pantheon-photos_logo.png"></media>Pantheon Photos Photo Manager</title>
 
     <section id="import" style="2column">
         <title>Importing Photos</title>

=== modified file 'help/C/organize-event.page'
--- help/C/organize-event.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-event.page	2014-02-24 07:36:30 +0000
@@ -11,11 +11,11 @@
 
 	<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>An event is a group of photos that were taken at approximately the same time. When you import photos, Pantheon Photos 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
+    <p>If a photo has no embedded date/time information, then Pantheon Photos 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.
@@ -52,7 +52,7 @@
 
     <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.
+    <p>By default, Pantheon Photos 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>

=== modified file 'help/C/organize-flag.page'
--- help/C/organize-flag.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-flag.page	2014-02-24 07:36:30 +0000
@@ -11,7 +11,7 @@
 
 	<title>Flagging photos</title>
 
-    <p>Shotwell lets you <em>flag</em> photos.  When a photo is flagged, a small flag icon
+    <p>Pantheon Photos 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>
     

=== modified file 'help/C/organize-rating.page'
--- help/C/organize-rating.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-rating.page	2014-02-24 07:36:30 +0000
@@ -10,7 +10,7 @@
     </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 assign each photo a rating from 1-5 stars, or may alternatively rate it as Rejected, in which case Pantheon Photos will hide the photo by default.</p>
 
 <p>You can rate a photo or a set of photos in any of these ways:</p>
 
@@ -21,9 +21,9 @@
 </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>
+Normally Pantheon Photos 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 Pantheon Photos 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>Pantheon Photos 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>

=== modified file 'help/C/organize-remove.page'
--- help/C/organize-remove.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-remove.page	2014-02-24 07:36:30 +0000
@@ -13,21 +13,21 @@
 
     <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>
+<p>This diagram shows how a photo, when deleted, is first put into Pantheon Photos'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>
+    The photos will be moved from your library to Pantheon Photos's Trash.</p>
+    <p>If you want to remove photos from Pantheon Photos 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>
+    <p>Select the Trash entry in the Sidebar and Pantheon Photos 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>Restore</title><p>Restore the selected photos into Pantheon Photos.</p></item>
     <item><title>Empty trash</title><p>Delete all photos from the trash folder.</p></item>
     </terms>
 </section>    

=== modified file 'help/C/organize-search.page'
--- help/C/organize-search.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-search.page	2014-02-24 07:36:30 +0000
@@ -12,7 +12,7 @@
     <title>Searching</title>
     
     <p>
-        There are two ways to search in Shotwell: the filter toolbar, and with a saved search.  The search 
+        There are two ways to search in Pantheon Photos: 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>
@@ -36,15 +36,15 @@
             </p>
             
             <p>
-                Disabling the search bar or exiting Shotwell automatically resets the search bar.
+                Disabling the search bar or exiting Pantheon Photos 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.
+                A saved search persists across Pantheon Photos sessions, and is updated as photos and videos are added 
+                and removed from your Pantheon Photos library.
             </p>
             
             <p>

=== modified file 'help/C/organize-tag.page'
--- help/C/organize-tag.page	2011-08-22 20:44:14 +0000
+++ help/C/organize-tag.page	2014-02-24 07:36:30 +0000
@@ -72,7 +72,7 @@
     <section id="hierarchaicaltags">
         <title>Hierarchical Tags</title>
             <p>
-				Shotwell supports also hierarchial tags. You can 
+				Pantheon Photos 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>.

=== modified file 'help/C/other-files.page'
--- help/C/other-files.page	2012-04-03 01:14:09 +0000
+++ help/C/other-files.page	2014-02-24 07:36:30 +0000
@@ -4,7 +4,7 @@
 
     <info>
         <link type="guide" xref="index#other"/>
-        <desc>Keep the Shotwell library in sync with photo files on disk.</desc>
+        <desc>Keep the Pantheon Photos library in sync with photo files on disk.</desc>
         
         <link type="next" xref="other-plugins"/>
     </info>
@@ -12,15 +12,15 @@
    <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.
+    Every photo in the Pantheon Photos library corresponds to a file stored on your hard disk.  Pantheon Photos has
+    several features which help you keep the Pantheon Photos 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 
+            Pantheon Photos 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.
@@ -78,7 +78,7 @@
     <section id="automatic-import">
        <title>Automatically importing photos</title>
        
-       <p>Shotwell can automatically import new photos which appear in the library directory.
+       <p>Pantheon Photos 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>
@@ -87,7 +87,7 @@
        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>
+       <note style="advanced"><p>Pantheon Photos can also follow symbolic links inside automatically-imported directories.</p></note>
 
     </section>
 
@@ -95,7 +95,7 @@
        <title>Automatically renaming imported photos to lowercase</title>
        
        <p>
-       Shotwell can automatically change the filenames of imported photos
+       Pantheon Photos 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.
@@ -106,13 +106,13 @@
     <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>By default, Pantheon Photos does not modify photo files, even when you edit photos or change their
+       tags or titles.  Pantheon Photos 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>
+       in the <gui>Preferences</gui> dialog.  When this option is enabled, Pantheon Photos will write
+       the following metadata to most photo files whenever you change it in Pantheon Photos:</p>
        
        <list>
        <item><p>titles</p></item>
@@ -122,8 +122,8 @@
        <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
+       <p>Pantheon Photos stores this information in photo files in EXIF, IPTC and/or XMP format.  Note
+       that Pantheon Photos can write only to photo files in JPEG, PNG and TIFF format, not to BMP photos, RAW photos
        or to video files.  
        </p>
     
@@ -132,11 +132,11 @@
     <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
+    <p>While Pantheon Photos is running, it notices changes made to any photo file externally.
+    When a photo file changes, Pantheon Photos 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
+    <p>Note that Pantheon Photos 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>
 

=== modified file 'help/C/other-missing.page'
--- help/C/other-missing.page	2011-08-22 20:44:14 +0000
+++ help/C/other-missing.page	2014-02-24 07:36:30 +0000
@@ -4,20 +4,20 @@
 
     <info>
         <link type="guide" xref="index#other"/>
-        <desc>If Shotwell can't find a photo in your library, it marks it as missing.</desc>
+        <desc>If Pantheon Photos 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>
+<p>Each time Pantheon Photos starts up, it scans your photo library to verify that all photo files still exist on your hard drive. If Pantheon Photos 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 Pantheon Photos 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 Pantheon Photos <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, Pantheon Photos will notice this the next time it starts. The photos will once again appear in the Photos, Events and Tags views.</p>
 
 </page>
 

=== modified file 'help/C/other-multiple.page'
--- help/C/other-multiple.page	2011-08-22 20:44:14 +0000
+++ help/C/other-multiple.page	2014-02-24 07:36:30 +0000
@@ -4,19 +4,19 @@
 
     <info>
         <link type="guide" xref="index#other"/>
-        <desc>You can open Shotwell with a different photo library by using the command line.</desc>
+        <desc>You can open Pantheon Photos 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>Pantheon Photos normally stores its database and photo thumbnails in the directory <file>~/.pantheon-photos</file> . This directory does not hold photos, but the database in this directory contains a list of all the photos in the Pantheon Photos 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>
+<p>As an advanced feature, it's possible for you to have multiple Pantheon Photos libraries, each of which has its own set of photos. Each library needs its own database directory. To launch Pantheon Photos with an alternate library, specify an alternate database directory on the command line as follows:</p>
 
 <screen>
-shotwell -d [library-directory]
+pantheon-photos -d [library-directory]
 </screen>
 
 </page>

=== modified file 'help/C/other-plugins.page'
--- help/C/other-plugins.page	2012-04-03 01:14:09 +0000
+++ help/C/other-plugins.page	2014-02-24 07:36:30 +0000
@@ -4,14 +4,14 @@
 
     <info>
         <link type="guide" xref="index#other"/>
-        <desc>Extend Shotwell's functionality dynamically.</desc>
+        <desc>Extend Pantheon Photos'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
+            Pantheon Photos 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>
         
@@ -23,7 +23,7 @@
         </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>
+        <link href="http://redmine.yorba.org/projects/pantheon-photos/wiki/Pantheon PhotosArchWritingPlugins">http://redmine.yorba.org/projects/pantheon-photos/wiki/ShotwellArchWritingPlugins</link></p></note>
     
 </page>
 

=== modified file 'help/C/raw.page'
--- help/C/raw.page	2011-09-08 00:16:45 +0000
+++ help/C/raw.page	2014-02-24 07:36:30 +0000
@@ -4,15 +4,15 @@
 
     <info>
         <link type="guide" xref="index#other"/>
-        <desc>More about RAW support in Shotwell.</desc>
+        <desc>More about RAW support in Pantheon Photos.</desc>
         
         <link type="next" xref="running" />
     </info>
    
-    <title>RAW support in Shotwell</title> 
+    <title>RAW support in Pantheon Photos</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
+    referred to as 'RAW' or 'camera RAW', and Pantheon Photos supports these files
     as well.</p>
     
     <p>Since RAW photographs normally cannot be displayed directly, but must
@@ -20,12 +20,12 @@
     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
+    RAW+JPEG.  If you import a RAW+JPEG pair, Pantheon Photos 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 
+    internally-developed JPEG or Pantheon Photos's by selecting 
     <guiseq><gui>Photos</gui><gui>Developer</gui></guiseq> in the menus.
     </p>
 
@@ -38,7 +38,7 @@
     
     <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 
+    exported first.  Pantheon Photos 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>  

=== modified file 'help/C/running.page'
--- help/C/running.page	2011-08-22 20:44:14 +0000
+++ help/C/running.page	2014-02-24 07:36:30 +0000
@@ -4,25 +4,25 @@
 
     <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>
+        <desc>Find Pantheon Photos 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
+	<title>Running Pantheon Photos</title>
+
+<p>Once installed, Pantheon Photos is available in your <gui>Applications</gui> menu under <gui>Graphics</gui> or <gui>Photography</gui>.</p>
+
+<p>Pantheon Photos may also be executed automatically when a camera is plugged in to your computer. To check
+that your system is set up to run Pantheon Photos 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>
+entitled <gui>Photos:</gui> which lets you choose Pantheon Photos 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>
+ <p>Pantheon Photos may also be executed directly from its build directory, although this is only recommended for testing out Pantheon Photos or for developers.</p>
 </note>
    
 </page>

=== modified file 'help/C/share-background.page'
--- help/C/share-background.page	2011-08-22 20:44:14 +0000
+++ help/C/share-background.page	2014-02-24 07:36:30 +0000
@@ -15,8 +15,8 @@
     
     <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.
+    Pantheon Photos 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 Pantheon Photos is not running.
     </p>
     
 </page>

=== modified file 'help/C/share-export.page'
--- help/C/share-export.page	2013-01-11 19:55:46 +0000
+++ help/C/share-export.page	2014-02-24 07:36:30 +0000
@@ -4,14 +4,14 @@
 
     <info>
         <link type="guide" xref="index#share"/>
-        <desc>Copy photos out of Shotwell so you can put them somewhere else.</desc>
+        <desc>Copy photos out of Pantheon Photos 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
+<p>To export photos from Pantheon Photos via drag and drop, drag the photos from Pantheon Photos onto
 a file manager window or your desktop. The new files will be full-sized copies of
 the photos in your library.</p>
 
@@ -25,21 +25,21 @@
 </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>
+any edits made in Pantheon Photos.  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 Pantheon Photos.  RAW photos will be
+exported in JPEG format if you have edited them in Pantheon Photos, 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.
+Pantheon Photos will be included, and Pantheon Photos 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>A scaling constraint (which means how Pantheon Photos 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>
+<p>If selected, Pantheon Photos will write tags, titles, and other metadata to the new files.</p>
 
 </page>
 

=== modified file 'help/C/share-print.page'
--- help/C/share-print.page	2011-08-22 20:44:14 +0000
+++ help/C/share-print.page	2014-02-24 07:36:30 +0000
@@ -14,7 +14,7 @@
     <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, 
+    Pantheon Photos 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>.

=== modified file 'help/C/share-send.page'
--- help/C/share-send.page	2011-08-22 20:44:14 +0000
+++ help/C/share-send.page	2014-02-24 07:36:30 +0000
@@ -11,9 +11,9 @@
 
 	<title>Sending photos</title>
 
-    <p>Shotwell can send photos using the GNOME desktop's Send To mechanism, which
+    <p>Pantheon Photos 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
+    <p>To send photos, select them in Pantheon Photos 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

=== modified file 'help/C/share-slideshow.page'
--- help/C/share-slideshow.page	2011-08-22 20:44:14 +0000
+++ help/C/share-slideshow.page	2014-02-24 07:36:30 +0000
@@ -11,7 +11,7 @@
 
 	<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>To see a sideshow of any collection in Pantheon Photos, 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>
     

=== modified file 'help/C/share-upload.page'
--- help/C/share-upload.page	2012-11-26 20:28:41 +0000
+++ help/C/share-upload.page	2014-02-24 07:36:30 +0000
@@ -11,7 +11,7 @@
 
 	<title>Publishing to the Web</title>
 
-    <p>Through the use of <link xref="other-plugins">plugins</link>, Shotwell can publish photos 
+    <p>Through the use of <link xref="other-plugins">plugins</link>, Pantheon Photos can publish photos 
     and videos to the following services, each of which requires an account:</p>
     
     <list>
@@ -28,11 +28,11 @@
      <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>Publishing to Facebook requires you to grant certain permissions to the Pantheon Photos Connect Facebook application.
+    You only need to grant these permissions once, when you first associate Pantheon Photos 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>Similarly, publishing to Flickr requires you to log in and permit Pantheon Photos 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>

=== modified file 'help/C/view-displaying.page'
--- help/C/view-displaying.page	2011-08-22 20:44:14 +0000
+++ help/C/view-displaying.page	2014-02-24 07:36:30 +0000
@@ -11,18 +11,18 @@
 
 	<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>When you select any collection in the sidebar, Pantheon Photos 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>
+<p>Pantheon Photos 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>
+<p>When you double-click a video, Pantheon Photos will launch an external video player to play the video.  It's not currently
+possible to display a video in full-window mode in Pantheon Photos or to play the video within Pantheon Photos itself.</p>
 </section>
     
 </page>

=== modified file 'help/C/view-sidebar.page'
--- help/C/view-sidebar.page	2012-10-24 00:35:07 +0000
+++ help/C/view-sidebar.page	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
 
 	<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 sidebar on the left side of the Pantheon Photos 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>
 

=== modified file 'help/Makefile.am'
--- help/Makefile.am	2014-01-16 09:32:34 +0000
+++ help/Makefile.am	2014-02-24 07:36:30 +0000
@@ -1,7 +1,7 @@
 # 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_ID = pantheon-photos
 
 DOC_PAGES = \
 	edit-adjustments.page \

=== modified file 'help/es/es.po'
--- help/es/es.po	2014-01-16 09:32:34 +0000
+++ help/es/es.po	2014-02-24 07:36:30 +0000
@@ -1,12 +1,12 @@
-# Spanish translation for shotwell.
-# Copyright (C) 2014 shotwell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the shotwell package.
+# Spanish translation for pantheon-photos.
+# Copyright (C) 2014 pantheon-photos's COPYRIGHT HOLDER
+# This file is distributed under the same license as the pantheon-photos package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # Daniel Mustieles <[e-mail]>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell master\n"
+"Project-Id-Version: pantheon-photos 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"
@@ -29,7 +29,7 @@
 
 #: C/view-sidebar.page:23(p)
 msgid ""
-"The sidebar on the left side of the Shotwell window lists various views of "
+"The sidebar on the left side of the Pantheon Photos 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 ""
@@ -101,7 +101,7 @@
 
 #: C/view-displaying.page:14(p)
 msgid ""
-"When you select any collection in the sidebar, Shotwell displays all photos "
+"When you select any collection in the sidebar, Pantheon Photos 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>) "
@@ -129,7 +129,7 @@
 
 #: C/view-displaying.page:20(p)
 msgid ""
-"Shotwell offers a fullscreen mode to display photos. Choose "
+"Pantheon Photos 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 "
@@ -143,9 +143,9 @@
 
 #: C/view-displaying.page:24(p)
 msgid ""
-"When you double-click a video, Shotwell will launch an external video player "
+"When you double-click a video, Pantheon Photos 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."
+"window mode in Pantheon Photos or to play the video within Pantheon Photos itself."
 msgstr ""
 
 #: C/share-upload.page:7(desc)
@@ -158,7 +158,7 @@
 
 #: C/share-upload.page:14(p)
 msgid ""
-"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
+"Through the use of <link xref=\"other-plugins\">plugins</link>, Pantheon Photos can "
 "publish photos and videos to the following services, each of which requires "
 "an account:"
 msgstr ""
@@ -207,14 +207,14 @@
 #: 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 "
+"Pantheon Photos Connect Facebook application. You only need to grant these "
+"permissions once, when you first associate Pantheon Photos 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 "
+"Similarly, publishing to Flickr requires you to log in and permit Pantheon Photos "
 "Connect to access your account."
 msgstr ""
 
@@ -235,7 +235,7 @@
 
 #: C/share-slideshow.page:14(p)
 msgid ""
-"To see a sideshow of any collection in Shotwell, navigate to that collection "
+"To see a sideshow of any collection in Pantheon Photos, navigate to that collection "
 "and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
 "<key>F5</key>."
 msgstr ""
@@ -266,13 +266,13 @@
 
 #: C/share-send.page:14(p)
 msgid ""
-"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
+"Pantheon Photos 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</"
+"To send photos, select them in Pantheon Photos 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 "
@@ -298,7 +298,7 @@
 
 #: C/share-print.page:16(p)
 msgid ""
-"Shotwell can also print multiple images in one page; to do this, select "
+"Pantheon Photos 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 "
@@ -313,7 +313,7 @@
 msgstr ""
 
 #: C/share-export.page:7(desc)
-msgid "Copy photos out of Shotwell so you can put them somewhere else."
+msgid "Copy photos out of Pantheon Photos so you can put them somewhere else."
 msgstr ""
 
 #: C/share-export.page:12(title)
@@ -322,8 +322,8 @@
 
 #: 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 "
+"To export photos from Pantheon Photos via drag and drop, drag the photos from "
+"Pantheon Photos onto a file manager window or your desktop. The new files will be "
 "full-sized copies of the photos in your library."
 msgstr ""
 
@@ -343,22 +343,22 @@
 #: 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 "
+"without any edits made in Pantheon Photos. 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. "
+"Choose <gui>Current</gui> to export photos including edits made in Pantheon Photos. "
 "RAW photos will be exported in JPEG format if you have edited them in "
-"Shotwell, and otherwise in their original RAW format."
+"Pantheon Photos, 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."
+"used for exporting. Any edits made in Pantheon Photos will be included, and "
+"Pantheon Photos will convert photos to the destination format."
 msgstr ""
 
 #: C/share-export.page:37(p)
@@ -367,7 +367,7 @@
 
 #: C/share-export.page:38(p)
 msgid ""
-"A scaling constraint (which means how Shotwell will decide to scale the "
+"A scaling constraint (which means how Pantheon Photos will decide to scale the "
 "photos down), and the desired pixel size."
 msgstr ""
 
@@ -380,7 +380,7 @@
 
 #: C/share-export.page:42(p)
 msgid ""
-"If selected, Shotwell will write tags, titles, and other metadata to the new "
+"If selected, Pantheon Photos will write tags, titles, and other metadata to the new "
 "files."
 msgstr ""
 
@@ -403,56 +403,56 @@
 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 "
+"gui><gui>Set as Desktop Slideshow</gui></guiseq>. Pantheon Photos 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."
+"The background slideshow will proceed even when Pantheon Photos is not running."
 msgstr ""
 
 #: C/running.page:7(desc)
 msgid ""
-"Find Shotwell in the Applications menu, or have it start automatically when "
+"Find Pantheon Photos in the Applications menu, or have it start automatically when "
 "you plug in a camera."
 msgstr ""
 
 #: C/running.page:14(title)
-msgid "Running Shotwell"
+msgid "Running Pantheon Photos"
 msgstr ""
 
 #: C/running.page:16(p)
 msgid ""
-"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
+"Once installed, Pantheon Photos 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 "
+"Pantheon Photos may also be executed automatically when a camera is plugged in to "
+"your computer. To check that your system is set up to run Pantheon Photos 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."
+"you choose Pantheon Photos 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."
+"Pantheon Photos may also be executed directly from its build directory, although "
+"this is only recommended for testing out Pantheon Photos or for developers."
 msgstr ""
 
 #: C/raw.page:7(desc)
-msgid "More about RAW support in Shotwell."
+msgid "More about RAW support in Pantheon Photos."
 msgstr ""
 
 #: C/raw.page:12(title)
-msgid "RAW support in Shotwell"
+msgid "RAW support in Pantheon Photos"
 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."
+"as 'RAW' or 'camera RAW', and Pantheon Photos supports these files as well."
 msgstr ""
 
 #: C/raw.page:18(p)
@@ -462,14 +462,14 @@
 "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 "
+"+JPEG. If you import a RAW+JPEG pair, Pantheon Photos 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</"
+"internally-developed JPEG or Pantheon Photos's by selecting <guiseq><gui>Photos</"
 "gui><gui>Developer</gui></guiseq> in the menus."
 msgstr ""
 
@@ -482,13 +482,13 @@
 #: 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 "
+"to be exported first. Pantheon Photos 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."
+msgid "Extend Pantheon Photos's functionality dynamically."
 msgstr ""
 
 #: C/other-plugins.page:12(title)
@@ -497,7 +497,7 @@
 
 #: C/other-plugins.page:13(p)
 msgid ""
-"Shotwell can be used with <em>plugins</em>, which are companion shared "
+"Pantheon Photos 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 ""
@@ -514,14 +514,14 @@
 #: 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>"
+"\"http://redmine.yorba.org/projects/pantheon-photos/wiki/Pantheon PhotosArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/pantheon-photos/wiki/"
+"Pantheon PhotosArchWritingPlugins</link>"
 msgstr ""
 
 #: C/other-multiple.page:7(desc)
 msgid ""
-"You can open Shotwell with a different photo library by using the command "
+"You can open Pantheon Photos with a different photo library by using the command "
 "line."
 msgstr ""
 
@@ -531,17 +531,17 @@
 
 #: 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 "
+"Pantheon Photos normally stores its database and photo thumbnails in the directory "
+"<file>~/.pantheon-photos</file> . This directory does not hold photos, but the "
+"database in this directory contains a list of all the photos in the Pantheon Photos "
 "library."
 msgstr ""
 
 #: C/other-multiple.page:16(p)
 msgid ""
-"As an advanced feature, it's possible for you to have multiple Shotwell "
+"As an advanced feature, it's possible for you to have multiple Pantheon Photos "
 "libraries, each of which has its own set of photos. Each library needs its "
-"own database directory. To launch Shotwell with an alternate library, "
+"own database directory. To launch Pantheon Photos with an alternate library, "
 "specify an alternate database directory on the command line as follows:"
 msgstr ""
 
@@ -549,11 +549,11 @@
 #, no-wrap
 msgid ""
 "\n"
-"shotwell -d [library-directory]\n"
+"pantheon-photos -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."
+msgid "If Pantheon Photos can't find a photo in your library, it marks it as missing."
 msgstr ""
 
 #: C/other-missing.page:12(title)
@@ -562,8 +562,8 @@
 
 #: 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 "
+"Each time Pantheon Photos starts up, it scans your photo library to verify that all "
+"photo files still exist on your hard drive. If Pantheon Photos 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."
@@ -571,7 +571,7 @@
 
 #: C/other-missing.page:16(p)
 msgid ""
-"If you no longer want the missing files to be part of your Shotwell "
+"If you no longer want the missing files to be part of your Pantheon Photos "
 "collection (perhaps because you deleted them), go to the Missing Files view, "
 "select the photos and then click <gui>Remove From Library</gui>."
 msgstr ""
@@ -579,7 +579,7 @@
 #: 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</"
+"<link xref=\"index#import\">import</link> them into Pantheon Photos <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."
@@ -587,13 +587,13 @@
 
 #: C/other-missing.page:20(p)
 msgid ""
-"If any missing photo files become available again, Shotwell will notice this "
+"If any missing photo files become available again, Pantheon Photos 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."
+msgid "Keep the Pantheon Photos library in sync with photo files on disk."
 msgstr ""
 
 #: C/other-files.page:12(title)
@@ -602,8 +602,8 @@
 
 #: 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 "
+"Every photo in the Pantheon Photos library corresponds to a file stored on your "
+"hard disk. Pantheon Photos has several features which help you keep the Pantheon Photos "
 "library and files on disk in sync."
 msgstr ""
 
@@ -613,7 +613,7 @@
 
 #: C/other-files.page:22(p)
 msgid ""
-"Shotwell allows you to specify how it names directories in your library. You "
+"Pantheon Photos 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."
@@ -807,7 +807,7 @@
 
 #: C/other-files.page:81(p)
 msgid ""
-"Shotwell can automatically import new photos which appear in the library "
+"Pantheon Photos 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.)"
@@ -821,7 +821,7 @@
 
 #: C/other-files.page:90(p)
 msgid ""
-"Shotwell can also follow symbolic links inside automatically-imported "
+"Pantheon Photos can also follow symbolic links inside automatically-imported "
 "directories."
 msgstr ""
 
@@ -831,7 +831,7 @@
 
 #: C/other-files.page:97(p)
 msgid ""
-"Shotwell can automatically change the filenames of imported photos to "
+"Pantheon Photos 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."
@@ -843,8 +843,8 @@
 
 #: 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 "
+"By default, Pantheon Photos does not modify photo files, even when you edit photos "
+"or change their tags or titles. Pantheon Photos records these changes in its own "
 "database only."
 msgstr ""
 
@@ -852,8 +852,8 @@
 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:"
+"dialog. When this option is enabled, Pantheon Photos will write the following "
+"metadata to most photo files whenever you change it in Pantheon Photos:"
 msgstr ""
 
 #: C/other-files.page:118(p)
@@ -878,8 +878,8 @@
 
 #: 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 "
+"Pantheon Photos stores this information in photo files in EXIF, IPTC and/or XMP "
+"format. Note that Pantheon Photos can write only to photo files in JPEG, PNG and "
 "TIFF format, not to BMP photos, RAW photos or to video files."
 msgstr ""
 
@@ -889,14 +889,14 @@
 
 #: 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 "
+"While Pantheon Photos is running, it notices changes made to any photo file "
+"externally. When a photo file changes, Pantheon Photos 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 "
+"Note that Pantheon Photos 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 ""
@@ -998,7 +998,7 @@
 
 #: C/organize-tag.page:74(p)
 msgid ""
-"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
+"Pantheon Photos 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 ""
@@ -1025,7 +1025,7 @@
 
 #: C/organize-search.page:14(p)
 msgid ""
-"There are two ways to search in Shotwell: the filter toolbar, and with a "
+"There are two ways to search in Pantheon Photos: 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."
@@ -1057,7 +1057,7 @@
 
 #: C/organize-search.page:38(p)
 msgid ""
-"Disabling the search bar or exiting Shotwell automatically resets the search "
+"Disabling the search bar or exiting Pantheon Photos automatically resets the search "
 "bar."
 msgstr ""
 
@@ -1067,8 +1067,8 @@
 
 #: C/organize-search.page:45(p)
 msgid ""
-"A saved search persists across Shotwell sessions, and is updated as photos "
-"and videos are added and removed from your Shotwell library."
+"A saved search persists across Pantheon Photos sessions, and is updated as photos "
+"and videos are added and removed from your Pantheon Photos library."
 msgstr ""
 
 #: C/organize-search.page:50(p)
@@ -1116,8 +1116,8 @@
 
 #: C/organize-remove.page:16(p)
 msgid ""
-"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 "
+"This diagram shows how a photo, when deleted, is first put into Pantheon Photos's "
+"trash. If you delete it from Pantheon Photos'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."
 msgstr ""
@@ -1130,12 +1130,12 @@
 msgid ""
 "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."
+"photos will be moved from your library to Pantheon Photos's Trash."
 msgstr ""
 
 #: C/organize-remove.page:22(p)
 msgid ""
-"If you want to remove photos from Shotwell without having them pass through "
+"If you want to remove photos from Pantheon Photos 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."
@@ -1147,7 +1147,7 @@
 
 #: C/organize-remove.page:27(p)
 msgid ""
-"Select the Trash entry in the Sidebar and Shotwell will display all photos "
+"Select the Trash entry in the Sidebar and Pantheon Photos will display all photos "
 "that have been marked for removal or deletion. In the Trash view, the "
 "following commands are available:"
 msgstr ""
@@ -1165,7 +1165,7 @@
 msgstr ""
 
 #: C/organize-remove.page:30(p)
-msgid "Restore the selected photos into Shotwell."
+msgid "Restore the selected photos into Pantheon Photos."
 msgstr ""
 
 #: C/organize-remove.page:31(title)
@@ -1225,7 +1225,7 @@
 #: C/organize-rating.page:13(p)
 msgid ""
 "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."
+"it as Rejected, in which case Pantheon Photos will hide the photo by default."
 msgstr ""
 
 #: C/organize-rating.page:15(p)
@@ -1254,17 +1254,17 @@
 
 #: C/organize-rating.page:23(p)
 msgid ""
-"Normally Shotwell displays all photos except rejected photos. You can set a "
+"Normally Pantheon Photos 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 "
+"rejected. The Pantheon Photos icon on the toolbar displays the current rating "
 "filter and can also be used to set the filter."
 msgstr ""
 
 #: C/organize-rating.page:26(p)
 msgid ""
-"Shotwell normally displays each photo's rating in its lower left-hand "
+"Pantheon Photos 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."
 msgstr ""
@@ -1287,7 +1287,7 @@
 
 #: C/organize-flag.page:14(p)
 msgid ""
-"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
+"Pantheon Photos 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."
@@ -1331,7 +1331,7 @@
 #: C/organize-event.page:14(p)
 msgid ""
 "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 "
+"time. When you import photos, Pantheon Photos checks when each photo was taken. It "
 "then groups the photos into events."
 msgstr ""
 
@@ -1345,7 +1345,7 @@
 
 #: C/organize-event.page:18(p)
 msgid ""
-"If a photo has no embedded date/time information, then Shotwell can't "
+"If a photo has no embedded date/time information, then Pantheon Photos 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."
@@ -1416,7 +1416,7 @@
 
 #: C/organize-event.page:55(p)
 msgid ""
-"By default, Shotwell uses the first photo in each event as its key photo. To "
+"By default, Pantheon Photos 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>."
 msgstr ""
@@ -1425,13 +1425,13 @@
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/index.page:23(None)
 msgid ""
-"@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+"@@image: 'figures/pantheon-photos_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
 msgstr ""
-"@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+"@@image: 'figures/pantheon-photos_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
 
 #: C/index.page:6(title) C/index.page:7(title)
-msgid "Shotwell"
-msgstr "Shotwell"
+msgid "Pantheon Photos"
+msgstr "Pantheon Photos"
 
 #: C/index.page:9(name)
 msgid "Jim Nelson"
@@ -1475,7 +1475,7 @@
 
 #: C/index.page:23(title)
 msgid ""
-"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
+"<media type=\"image\" src=\"figures/pantheon-photos_logo.png\"/>Pantheon Photos Photo "
 "Manager"
 msgstr ""
 
@@ -1535,7 +1535,7 @@
 
 #: C/import-memorycard.page:28(p)
 msgid ""
-"Shotwell can import photos from any memory card that is compatible with your "
+"Pantheon Photos can import photos from any memory card that is compatible with your "
 "card reader."
 msgstr ""
 
@@ -1550,7 +1550,7 @@
 
 #: C/import-f-spot.page:7(desc)
 msgid ""
-"Shotwell can import all your photos and tags from the F-Spot photo manager."
+"Pantheon Photos can import all your photos and tags from the F-Spot photo manager."
 msgstr ""
 
 #: C/import-f-spot.page:12(title)
@@ -1574,7 +1574,7 @@
 
 #: C/import-f-spot.page:20(p)
 msgid ""
-"Shotwell will import your photos, together with their tags and other "
+"Pantheon Photos 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 "
@@ -1591,8 +1591,8 @@
 
 #: C/import-file.page:14(p)
 msgid ""
-"To import photo files from your hard disk into Shotwell, just drag them from "
-"your file browser into the Shotwell window."
+"To import photo files from your hard disk into Pantheon Photos, just drag them from "
+"your file browser into the Pantheon Photos window."
 msgstr ""
 
 #: C/import-file.page:16(p)
@@ -1603,17 +1603,17 @@
 
 #: C/import-file.page:18(p)
 msgid ""
-"Shotwell will ask whether you want to copy the photo files to your library "
+"Pantheon Photos 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."
 msgstr ""
 
 #: C/import-file.page:20(p)
 msgid ""
-"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
+"If you hold down <key>Ctrl</key> while dragging photos in, Pantheon Photos 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."
+"dragging photos in, Pantheon Photos will import the photos without copying them."
 msgstr ""
 
 #: C/import-file.page:22(p)
@@ -1637,7 +1637,7 @@
 
 #: C/import-camera.page:18(p)
 msgid ""
-"Connect the camera to your computer and switch it on. Shotwell will detect "
+"Connect the camera to your computer and switch it on. Pantheon Photos will detect "
 "it and list it in the sidebar."
 msgstr ""
 
@@ -1669,7 +1669,7 @@
 
 #: C/formats.page:7(desc)
 msgid ""
-"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
+"Pantheon Photos supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
 "files."
 msgstr ""
 
@@ -1679,14 +1679,14 @@
 
 #: C/formats.page:14(p)
 msgid ""
-"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
-"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
+"Pantheon Photos supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> photo files. Pantheon Photos does not yet support other graphics "
 "format such as GIF."
 msgstr ""
 
 #: C/formats.page:16(p)
 msgid ""
-"Shotwell's RAW format support is currently limited. When you view a RAW "
+"Pantheon Photos'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 "
@@ -1695,14 +1695,14 @@
 
 #: C/formats.page:18(p)
 msgid ""
-"For more information about RAW-format photos in Shotwell, please see the "
+"For more information about RAW-format photos in Pantheon Photos, please see the "
 "<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
 msgstr ""
 
 #: C/formats.page:22(p)
 msgid ""
-"Shotwell also supports video files in any format supported by the GStreamer "
-"media library on the system where Shotwell is running. This typically "
+"Pantheon Photos also supports video files in any format supported by the GStreamer "
+"media library on the system where Pantheon Photos is running. This typically "
 "includes the following formats among others:"
 msgstr ""
 
@@ -1719,9 +1719,9 @@
 
 #: C/formats.page:30(p)
 msgid ""
-"Shotwell supports both photos and videos, but for simplicity, this "
+"Pantheon Photos 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, "
+"in Pantheon Photos apply to both photos and videos, however. In particular, events, "
 "flagging, rating, tagging, and publishing work both for photos and for "
 "videos."
 msgstr ""
@@ -1736,7 +1736,7 @@
 
 #: C/edit-undo.page:16(p)
 msgid ""
-"Because Shotwell is a non-destructive photo editor, you can undo any "
+"Because Pantheon Photos is a non-destructive photo editor, you can undo any "
 "alterations you make to a photograph."
 msgstr ""
 
@@ -1778,9 +1778,9 @@
 
 #: C/edit-time-date.page:18(p)
 msgid ""
-"By default, the time and date are only changed inside Shotwell. You can also "
+"By default, the time and date are only changed inside Pantheon Photos. You can also "
 "choose to modify the time and date in the original file, but this cannot be "
-"undone once you exit Shotwell."
+"undone once you exit Pantheon Photos."
 msgstr ""
 
 #: C/edit-straighten.page:7(desc)
@@ -1894,7 +1894,7 @@
 
 #: C/edit-nondestructive.page:7(desc)
 msgid ""
-"Shotwell is a non-destructive photo editor - it does not modify your "
+"Pantheon Photos is a non-destructive photo editor - it does not modify your "
 "original photos."
 msgstr ""
 
@@ -1904,16 +1904,16 @@
 
 #: C/edit-nondestructive.page:14(p)
 msgid ""
-"Shotwell is a non-destructive photo editor. It does not modify your original "
+"Pantheon Photos 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 "
+"photo file on disc remains untouched. Pantheon Photos 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."
 msgstr ""
 
 #: C/edit-nondestructive.page:18(p)
 msgid ""
-"Note that Shotwell can optionally write metadata (such as tags and titles) "
+"Note that Pantheon Photos 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>."
 msgstr ""
@@ -1947,7 +1947,7 @@
 
 #: C/edit-external.page:31(p)
 msgid ""
-"When you complete your edits and save the file, Shotwell will detect the "
+"When you complete your edits and save the file, Pantheon Photos 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."
@@ -1960,19 +1960,19 @@
 #: C/edit-external.page:43(p)
 msgid ""
 "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 "
+"such as a JPEG or PNG, Pantheon Photos cannot automatically determine that the "
 "original RAW and the new image should be paired."
 msgstr ""
 
 #: C/edit-external.page:49(p)
 msgid ""
-"If you want to work within the resulting image within Shotwell, you'll need "
+"If you want to work within the resulting image within Pantheon Photos, you'll need "
 "to import it yourself."
 msgstr ""
 
 #: C/edit-enhance.page:7(desc)
 msgid ""
-"Let Shotwell improve the brightness and contrast of a photo automatically."
+"Let Pantheon Photos improve the brightness and contrast of a photo automatically."
 msgstr ""
 
 #: C/edit-enhance.page:14(title)
@@ -2042,7 +2042,7 @@
 #: C/edit-crop.page:29(p)
 msgid ""
 "When you're happy with your crop outline, press the <gui>Apply</gui> button. "
-"Shotwell will display the cropped photo."
+"Pantheon Photos will display the cropped photo."
 msgstr ""
 
 #: C/edit-crop.page:32(p)
@@ -2053,7 +2053,7 @@
 
 #: C/edit-crop.page:33(p)
 msgid ""
-"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Pantheon Photos will "
 "return to the photo's previous crop dimensions."
 msgstr ""
 

=== renamed file 'icons/shotwell-16.svg' => 'icons/pantheon-photos-16.svg'
--- icons/shotwell-16.svg	2010-08-18 23:46:19 +0000
+++ icons/pantheon-photos-16.svg	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
    enable-background="new 0 0 180 180"
    xml:space="preserve"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
+   sodipodi:docname="pantheon-photos.svg"><metadata
    id="metadata9"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs

=== renamed file 'icons/shotwell-24.svg' => 'icons/pantheon-photos-24.svg'
--- icons/shotwell-24.svg	2010-08-18 23:46:19 +0000
+++ icons/pantheon-photos-24.svg	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
    enable-background="new 0 0 180 180"
    xml:space="preserve"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
+   sodipodi:docname="pantheon-photos.svg"><metadata
    id="metadata9"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs

=== renamed file 'icons/shotwell.ico' => 'icons/pantheon-photos.ico'
=== renamed file 'icons/shotwell.svg' => 'icons/pantheon-photos.svg'
--- icons/shotwell.svg	2010-08-18 23:46:19 +0000
+++ icons/pantheon-photos.svg	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
    enable-background="new 0 0 180 180"
    xml:space="preserve"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
+   sodipodi:docname="pantheon-photos.svg"><metadata
    id="metadata9"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs

=== renamed file 'misc/org.yorba.shotwell-extras.gschema.xml' => 'misc/org.pantheon.photos-extras.gschema.xml'
--- misc/org.yorba.shotwell-extras.gschema.xml	2012-09-26 22:57:58 +0000
+++ misc/org.pantheon.photos-extras.gschema.xml	2014-02-24 07:36:30 +0000
@@ -1,6 +1,6 @@
 <schemalist>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-yandex-fotki/">
+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-yandex-fotki" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-yandex-fotki/">
     <key name="auth-token" type="s">
         <default>""</default>
         <summary>authentication token</summary>
@@ -8,7 +8,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-tumblr" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-tumblr/">
+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-tumblr" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-tumblr/">
     <key name="token" type="s">
         <default>""</default>
         <summary>Token</summary>

=== renamed file 'misc/org.yorba.shotwell.gschema.xml' => 'misc/org.pantheon.photos.gschema.xml'
--- misc/org.yorba.shotwell.gschema.xml	2014-01-28 03:57:59 +0000
+++ misc/org.pantheon.photos.gschema.xml	2014-02-24 07:36:30 +0000
@@ -1,22 +1,22 @@
 <schemalist>
 
-<schema id="org.yorba.shotwell" path="/org/yorba/shotwell/">
-    <child name="preferences" schema="org.yorba.shotwell.preferences" />
-    <child name="sharing" schema="org.yorba.shotwell.sharing" />
-    <child name="video" schema="org.yorba.shotwell.video" />
-    <child name="printing" schema="org.yorba.shotwell.printing" />
-    <child name="plugins" schema="org.yorba.shotwell.plugins" />
-</schema>
-
-<schema id="org.yorba.shotwell.preferences" path="/org/yorba/shotwell/preferences/">
-    <child name="ui" schema="org.yorba.shotwell.preferences.ui" />
-    <child name="slideshow" schema="org.yorba.shotwell.preferences.slideshow" />
-    <child name="window" schema="org.yorba.shotwell.preferences.window" />
-    <child name="files" schema="org.yorba.shotwell.preferences.files" />
-    <child name="editing" schema="org.yorba.shotwell.preferences.editing" />
-</schema>
-
-<schema id="org.yorba.shotwell.preferences.ui" path="/org/yorba/shotwell/preferences/ui/">
+<schema id="org.pantheon.photos" path="/org/pantheon/photos/">
+    <child name="preferences" schema="org.pantheon.photos.preferences" />
+    <child name="sharing" schema="org.pantheon.photos.sharing" />
+    <child name="video" schema="org.pantheon.photos.video" />
+    <child name="printing" schema="org.pantheon.photos.printing" />
+    <child name="plugins" schema="org.pantheon.photos.plugins" />
+</schema>
+
+<schema id="org.pantheon.photos.preferences" path="/org/pantheon/photos/preferences/">
+    <child name="ui" schema="org.pantheon.photos.preferences.ui" />
+    <child name="slideshow" schema="org.pantheon.photos.preferences.slideshow" />
+    <child name="window" schema="org.pantheon.photos.preferences.window" />
+    <child name="files" schema="org.pantheon.photos.preferences.files" />
+    <child name="editing" schema="org.pantheon.photos.preferences.editing" />
+</schema>
+
+<schema id="org.pantheon.photos.preferences.ui" path="/org/pantheon/photos/preferences/ui/">
     <key name="display-basic-properties" type="b">
         <default>true</default>
         <summary>display basic properties</summary>
@@ -156,7 +156,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.slideshow" path="/org/yorba/shotwell/preferences/slideshow/">
+<schema id="org.pantheon.photos.preferences.slideshow" path="/org/pantheon/photos/preferences/slideshow/">
     <key name="delay" type="d">
         <default>3.0</default>
         <summary>delay</summary>
@@ -182,7 +182,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.window" path="/org/yorba/shotwell/preferences/window/">
+<schema id="org.pantheon.photos.preferences.window" path="/org/pantheon/photos/preferences/window/">
     <key name="library-maximize" type="b">
         <default>false</default>
         <summary>maximize library window</summary>
@@ -226,7 +226,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.files" path="/org/yorba/shotwell/preferences/files/">
+<schema id="org.pantheon.photos.preferences.files" path="/org/pantheon/photos/preferences/files/">
     <key name="import-dir" type="s">
         <default>""</default>
         <summary>import directory</summary>
@@ -248,7 +248,7 @@
     <key name="use-lowercase-filenames" type="b">
         <default>false</default>
         <summary>use lowercase filenames</summary>
-        <description>If true, Shotwell will convert all filenames to lowercase when importing photo files</description>
+        <description>If true, Pantheon Photos will convert all filenames to lowercase when importing photo files</description>
     </key>
 
     <key name="directory-pattern" type="s">
@@ -266,11 +266,11 @@
     <key name="raw-developer-default" type="s">
         <default>'CAMERA'</default>
         <summary>RAW developer default</summary>
-        <description>Default option for which RAW developer Shotwell will use.</description>
+        <description>Default option for which RAW developer Pantheon Photos will use.</description>
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.crop-settings" path="/org/yorba/shotwell/crop-settings/">
+<schema id="org.pantheon.photos.crop-settings" path="/org/pantheon/photos/crop-settings/">
     <key name="last-crop-menu-choice" type="i">
         <default>1</default>
         <summary>Most-recently-used crop aspect ratio menu choice.</summary>
@@ -288,7 +288,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.editing" path="/org/yorba/shotwell/preferences/editing/">
+<schema id="org.pantheon.photos.preferences.editing" path="/org/pantheon/photos/preferences/editing/">
     <key name="external-photo-editor" type="s">
         <default>""</default>
         <summary>external photo editor</summary>
@@ -302,7 +302,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing" path="/org/yorba/shotwell/sharing/">
+<schema id="org.pantheon.photos.sharing" path="/org/pantheon/photos/sharing/">
     <key name="last-used-service" type="s">
         <default>""</default>
         <summary>last used publishing service</summary>
@@ -315,13 +315,13 @@
         <description>A numeric code representing the last service to which photos were published</description>
     </key>
     
-    <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
-    <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
-    <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
-    <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
+    <child name="facebook" schema="org.pantheon.photos.sharing.facebook" />
+    <child name="flickr" schema="org.pantheon.photos.sharing.flickr" />
+    <child name="picasa" schema="org.pantheon.photos.sharing.picasa" />
+    <child name="youtube" schema="org.pantheon.photos.sharing.youtube" />
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.facebook" path="/org/yorba/shotwell/sharing/facebook/">
+<schema id="org.pantheon.photos.sharing.facebook" path="/org/pantheon/photos/sharing/facebook/">
     <key name="access-token" type="s">
         <default>""</default>
         <summary>access token</summary>
@@ -353,7 +353,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.flickr" path="/org/yorba/shotwell/sharing/flickr/">
+<schema id="org.pantheon.photos.sharing.flickr" path="/org/pantheon/photos/sharing/flickr/">
     <key name="access-phase-token" type="s">
         <default>""</default>
         <summary>OAuth Access Phase Token</summary>
@@ -391,7 +391,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/">
+<schema id="org.pantheon.photos.sharing.picasa" path="/org/pantheon/photos/sharing/picasa/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -417,7 +417,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-piwigo/">
+<schema id="org.pantheon.photos.sharing.org-pantheon-photos-publishing-piwigo" path="/org/pantheon/photos/sharing/org-pantheon-photos-publishing-piwigo/">
     <key name="url" type="s">
         <default>""</default>
         <summary>Piwigio URL</summary>
@@ -479,7 +479,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.youtube" path="/org/yorba/shotwell/sharing/youtube/">
+<schema id="org.pantheon.photos.sharing.youtube" path="/org/pantheon/photos/sharing/youtube/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -487,7 +487,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.dataimports" path="/org/yorba/shotwell/dataimports/">
+<schema id="org.pantheon.photos.dataimports" path="/org/pantheon/photos/dataimports/">
     <key name="last-used-dataimports-service" type="s">
         <default>""</default>
         <summary>last used import service</summary>
@@ -495,7 +495,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.video" path="/org/yorba/shotwell/video/">
+<schema id="org.pantheon.photos.video" path="/org/pantheon/photos/video/">
     <key name="interpreter-state-cookie" type="i">
         <default>-1</default>
         <summary>interpreter state cookie</summary>
@@ -503,7 +503,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.printing" path="/org/yorba/shotwell/printing/">
+<schema id="org.pantheon.photos.printing" path="/org/pantheon/photos/printing/">
     <key name="content-layout" type="i">
         <default>3</default>
         <summary>content layout mode</summary>
@@ -565,11 +565,11 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.plugins" path="/org/yorba/shotwell/plugins/" >
-    <child name="enable-state" schema="org.yorba.shotwell.plugins.enable-state" />
+<schema id="org.pantheon.photos.plugins" path="/org/pantheon/photos/plugins/" >
+    <child name="enable-state" schema="org.pantheon.photos.plugins.enable-state" />
 </schema>
 
-<schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" >
+<schema id="org.pantheon.photos.plugins.enable-state" path="/org/pantheon/photos/plugins/enable-state/" >
     <key name="publishing-facebook" type="b">
         <default>true</default>
         <summary>enable facebook publishing plugin</summary>

=== renamed file 'misc/shotwell-viewer.desktop.head' => 'misc/pantheon-photos-viewer.desktop.head'
--- misc/shotwell-viewer.desktop.head	2013-08-06 01:43:20 +0000
+++ misc/pantheon-photos-viewer.desktop.head	2014-02-24 07:36:30 +0000
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Version=1.0
-Name=Shotwell Viewer
+Name=Pantheon Photos Viewer
 GenericName=Photo Viewer
-Exec=shotwell %f
-Icon=shotwell
+Exec=pantheon-photos %f
+Icon=pantheon-photos
 Terminal=false
 NoDisplay=true
 Type=Application
 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=Shotwell Photo Viewer
+X-GNOME-Gettext-Domain=pantheon-photos
+X-GNOME-FullName=Pantheon Photos Photo Viewer

=== renamed file 'misc/shotwell.appdata.xml' => 'misc/pantheon-photos.appdata.xml'
--- misc/shotwell.appdata.xml	2013-10-02 00:04:14 +0000
+++ misc/pantheon-photos.appdata.xml	2014-02-24 07:36:30 +0000
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Yorba Foundation ([e-mail]) -->
+<!-- Copyright 2013 Yorba Foundation ([e-mail]) -->
 <application>
-  <id type="desktop">shotwell.desktop</id>
+  <id type="desktop">pantheon-photos.desktop</id>
   <licence>CC0</licence>
   <summary>Popular photo manager</summary>
   <description>
     <p>
-      Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop.
+      Pantheon Photos is an easy-to-use, fast photo organizer designed for the GNOME desktop.
       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.  Shotwell's non-destructive photo editor does not alter
+      color adjustments, and straighten.  Pantheon Photos's non-destructive photo editor does not alter
       your master photos, making it easy to experiment and correct errors.
     </p>
     <p>
-      When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr,
+      When ready, Pantheon Photos can upload your photos to various web sites, such as Facebook, Flickr,
       Picasa (Google Plus), and more.
     </p>
     <p>
-      Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.
+      Pantheon Photos supports JPEG, PNG, TIFF, and a variety of RAW file formats.
     </p>
   </description>
-  <url type="homepage">http://www.yorba.org/projects/shotwell/</url>
+  <url type="homepage">http://www.yorba.org/projects/pantheon-photos/</url>
   <screenshots>
     <screenshot type="default">http://www.yorba.org/wp-content/uploads/2013/02/harbor.png</screenshot>
     <screenshot>http://www.yorba.org/wp-content/uploads/2013/02/import-300x155.png</screenshot>
@@ -28,6 +28,6 @@
     <screenshot>http://www.yorba.org/wp-content/uploads/2013/02/edit-300x247.png</screenshot>
     <screenshot>http://www.yorba.org/wp-content/uploads/2013/02/publish-300x213.png</screenshot>
   </screenshots>
-  <updatecontact>[e-mail]</updatecontact>
+  <updatecontact>[e-mail]</updatecontact>
   <project_group>GNOME</project_group>
 </application>

=== renamed file 'misc/shotwell.convert' => 'misc/pantheon-photos.convert'
--- misc/shotwell.convert	2012-08-29 00:04:10 +0000
+++ misc/pantheon-photos.convert	2014-02-24 07:36:30 +0000
@@ -1,105 +1,105 @@
-[org.yorba.shotwell.preferences.ui]
-background-color = /apps/shotwell/preferences/ui/background_color
-display-basic-properties = /apps/shotwell/preferences/ui/display_basic_properties
-display-extended-properties = /apps/shotwell/preferences/ui/display_extended_properties
-display-photo-ratings = /apps/shotwell/preferences/ui/display_photo_ratings
-display-photo-tags = /apps/shotwell/preferences/ui/display_photo_tags
-display-photo-titles = /apps/shotwell/preferences/ui/display_photo_titles
-event-photos-sort-ascending = /apps/shotwell/preferences/ui/event_photos_sort_ascending
-event-photos-sort-by = /apps/shotwell/preferences/ui/event_photos_sort_by
-events-sort-ascending = /apps/shotwell/preferences/ui/events_sort_ascending
-hide-photos-already-imported = /apps/shotwell/preferences/ui/hide_photos_already_imported
-keep-relativity = /apps/shotwell/preferences/ui/keep_relativity
-library-photos-sort-ascending = /apps/shotwell/preferences/ui/library_photos_sort_ascending
-library-photos-sort-by = /apps/shotwell/preferences/ui/library_photos_sort_by
-modify-originals = /apps/shotwell/preferences/ui/modify_originals
-photo-thumbnail-scale = /apps/shotwell/preferences/ui/photo_thumbnail_scale
-show-welcome-dialog = /apps/shotwell/preferences/ui/show_welcome_dialog
-sidebar-position = /apps/shotwell/preferences/ui/pane_position
-use-24-hour-time = /apps/shotwell/preferences/ui/twentyfour_hr_time
-
-[org.yorba.shotwell.preferences.slideshow]
-delay = /apps/shotwell/preferences/slideshow/delay
-transition-delay = /apps/shotwell/preferences/slideshow_transition/delay
-transition-effect-id = /apps/shotwell/preferences/slideshow_transition/name
-show-title = /apps/shotwell/preferences/slideshow/show-title
-
-[org.yorba.shotwell.preferences.window]
-direct-height = /apps/shotwell/preferences/window/direct_height
-direct-maximize = /apps/shotwell/preferences/window/direct_maximize
-direct-width = /apps/shotwell/preferences/window/direct_width
-library-height = /apps/shotwell/preferences/window/library_height
-library-maximize = /apps/shotwell/preferences/window/library_maximize
-library-width = /apps/shotwell/preferences/window/library_width
-
-[org.yorba.shotwell.preferences.files]
-auto-import = /apps/shotwell/preferences/files/auto_import
-commit-metadata = /apps/shotwell/preferences/files/commit_metadata
-directory-pattern = /apps/shotwell/preferences/files/directory_pattern
-directory-pattern-custom = /apps/shotwell/preferences/files/directory_pattern_custom
-import-dir = /apps/shotwell/preferences/files/import_dir
-use-lowercase-filenames = /apps/shotwell/preferences/files/use_lowercase_filenames
-raw-developer-default = /apps/shotwell/preferences/files/raw_developer_default
-
-[org.yorba.shotwell.preferences.editing]
-external-photo-editor = /apps/shotwell/preferences/editing/external_photo_editor
-external-raw-editor = /apps/shotwell/preferences/editing/external_raw_editor
-
-[org.yorba.shotwell.video]
-interpreter-state-cookie = /apps/shotwell/video/interpreter_state_cookie
-
-[org.yorba.shotwell.printing]
-content-height = /apps/shotwell/printing/content_height
-content-layout = /apps/shotwell/printing/content_layout
-content-ppi = /apps/shotwell/printing/content_ppi
-content-units = /apps/shotwell/printing/content_units
-content-width = /apps/shotwell/printing/content_width
-images-per-page = /apps/shotwell/printing/images_per_page_selection
-match-aspect-ratio = /apps/shotwell/printing/match_aspect_ratio
-print-titles = /apps/shotwell/printing/print_titles
-size-selection = /apps/shotwell/printing/size_selection
-titles-font = /apps/shotwell/printing/print_titles_font
-
-[org.yorba.shotwell.sharing]
-default-service = /apps/shotwell/sharing/default_service
-last-used-service = /apps/shotwell/sharing/last_used_service
-
-[org.yorba.shotwell.plugins.enable-state]
-publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled
-publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled
-publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled
-publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled
-publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled
-publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled
-transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled
-transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled
-transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled
-
-[org.yorba.shotwell.sharing.facebook]
-uid = /apps/shotwell/sharing/facebook/uid
-user-name = /apps/shotwell/sharing/facebook/user_name
-default-size = /apps/shotwell/sharing/facebook/default_size
-
-[org.yorba.shotwell.sharing.flickr]
-default-size = /apps/shotwell/sharing/flickr/default_size
-visibility = /apps/shotwell/sharing/flickr/visibility
-
-[org.yorba.shotwell.sharing.picasa]
-default-size = /apps/shotwell/sharing/picasa/default_size
-last-album = /apps/shotwell/sharing/picasa/last_album
-
-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo]
-url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url
-username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username
-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password
-remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password
-last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category
-last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level
-
-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki]
-auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token
-
-[org.yorba.shotwell.sharing.youtube]
-user-name = /apps/shotwell/sharing/youtube/user_name
-auth-token = /apps/shotwell/sharing/youtube/auth_token
+[org.pantheon.photos.preferences.ui]
+background-color = /apps/pantheon-photos/preferences/ui/background_color
+display-basic-properties = /apps/pantheon-photos/preferences/ui/display_basic_properties
+display-extended-properties = /apps/pantheon-photos/preferences/ui/display_extended_properties
+display-photo-ratings = /apps/pantheon-photos/preferences/ui/display_photo_ratings
+display-photo-tags = /apps/pantheon-photos/preferences/ui/display_photo_tags
+display-photo-titles = /apps/pantheon-photos/preferences/ui/display_photo_titles
+event-photos-sort-ascending = /apps/pantheon-photos/preferences/ui/event_photos_sort_ascending
+event-photos-sort-by = /apps/pantheon-photos/preferences/ui/event_photos_sort_by
+events-sort-ascending = /apps/pantheon-photos/preferences/ui/events_sort_ascending
+hide-photos-already-imported = /apps/pantheon-photos/preferences/ui/hide_photos_already_imported
+keep-relativity = /apps/pantheon-photos/preferences/ui/keep_relativity
+library-photos-sort-ascending = /apps/pantheon-photos/preferences/ui/library_photos_sort_ascending
+library-photos-sort-by = /apps/pantheon-photos/preferences/ui/library_photos_sort_by
+modify-originals = /apps/pantheon-photos/preferences/ui/modify_originals
+photo-thumbnail-scale = /apps/pantheon-photos/preferences/ui/photo_thumbnail_scale
+show-welcome-dialog = /apps/pantheon-photos/preferences/ui/show_welcome_dialog
+sidebar-position = /apps/pantheon-photos/preferences/ui/pane_position
+use-24-hour-time = /apps/pantheon-photos/preferences/ui/twentyfour_hr_time
+
+[org.pantheon.photos.preferences.slideshow]
+delay = /apps/pantheon-photos/preferences/slideshow/delay
+transition-delay = /apps/pantheon-photos/preferences/slideshow_transition/delay
+transition-effect-id = /apps/pantheon-photos/preferences/slideshow_transition/name
+show-title = /apps/pantheon-photos/preferences/slideshow/show-title
+
+[org.pantheon.photos.preferences.window]
+direct-height = /apps/pantheon-photos/preferences/window/direct_height
+direct-maximize = /apps/pantheon-photos/preferences/window/direct_maximize
+direct-width = /apps/pantheon-photos/preferences/window/direct_width
+library-height = /apps/pantheon-photos/preferences/window/library_height
+library-maximize = /apps/pantheon-photos/preferences/window/library_maximize
+library-width = /apps/pantheon-photos/preferences/window/library_width
+
+[org.pantheon.photos.preferences.files]
+auto-import = /apps/pantheon-photos/preferences/files/auto_import
+commit-metadata = /apps/pantheon-photos/preferences/files/commit_metadata
+directory-pattern = /apps/pantheon-photos/preferences/files/directory_pattern
+directory-pattern-custom = /apps/pantheon-photos/preferences/files/directory_pattern_custom
+import-dir = /apps/pantheon-photos/preferences/files/import_dir
+use-lowercase-filenames = /apps/pantheon-photos/preferences/files/use_lowercase_filenames
+raw-developer-default = /apps/pantheon-photos/preferences/files/raw_developer_default
+
+[org.pantheon.photos.preferences.editing]
+external-photo-editor = /apps/pantheon-photos/preferences/editing/external_photo_editor
+external-raw-editor = /apps/pantheon-photos/preferences/editing/external_raw_editor
+
+[org.pantheon.photos.video]
+interpreter-state-cookie = /apps/pantheon-photos/video/interpreter_state_cookie
+
+[org.pantheon.photos.printing]
+content-height = /apps/pantheon-photos/printing/content_height
+content-layout = /apps/pantheon-photos/printing/content_layout
+content-ppi = /apps/pantheon-photos/printing/content_ppi
+content-units = /apps/pantheon-photos/printing/content_units
+content-width = /apps/pantheon-photos/printing/content_width
+images-per-page = /apps/pantheon-photos/printing/images_per_page_selection
+match-aspect-ratio = /apps/pantheon-photos/printing/match_aspect_ratio
+print-titles = /apps/pantheon-photos/printing/print_titles
+size-selection = /apps/pantheon-photos/printing/size_selection
+titles-font = /apps/pantheon-photos/printing/print_titles_font
+
+[org.pantheon.photos.sharing]
+default-service = /apps/pantheon-photos/sharing/default_service
+last-used-service = /apps/pantheon-photos/sharing/last_used_service
+
+[org.pantheon.photos.plugins.enable-state]
+publishing-facebook = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.facebook/enabled
+publishing-flickr = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.flickr/enabled
+publishing-picasa = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.picasa/enabled
+publishing-piwigo = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.piwigo/enabled
+publishing-yandex-fotki = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.yandex-fotki/enabled
+publishing-youtube = /apps/pantheon-photos/plugins/org.pantheon.photos.publishing.youtube/enabled
+transitions-crumble = /apps/pantheon-photos/plugins/org.pantheon.photos.transitions.crumble/enabled
+transitions-fade = /apps/pantheon-photos/plugins/org.pantheon.photos.transitions.fade/enabled
+transitions-slide = /apps/pantheon-photos/plugins/org.pantheon.photos.transitions.slide/enabled
+
+[org.pantheon.photos.sharing.facebook]
+uid = /apps/pantheon-photos/sharing/facebook/uid
+user-name = /apps/pantheon-photos/sharing/facebook/user_name
+default-size = /apps/pantheon-photos/sharing/facebook/default_size
+
+[org.pantheon.photos.sharing.flickr]
+default-size = /apps/pantheon-photos/sharing/flickr/default_size
+visibility = /apps/pantheon-photos/sharing/flickr/visibility
+
+[org.pantheon.photos.sharing.picasa]
+default-size = /apps/pantheon-photos/sharing/picasa/default_size
+last-album = /apps/pantheon-photos/sharing/picasa/last_album
+
+[org.pantheon.photos.sharing.org-pantheon-photos-publishing-piwigo]
+url = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/url
+username = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/username
+password = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/password
+remember-password = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/remember-password
+last-category = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/last-category
+last-permission-level = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.piwigo/last-permission-level
+
+[org.pantheon.photos.sharing.org-pantheon-photos-publishing-yandex-fotki]
+auth-token = /apps/pantheon-photos/sharing/org.pantheon.photos.publishing.yandex-fotki/auth_token
+
+[org.pantheon.photos.sharing.youtube]
+user-name = /apps/pantheon-photos/sharing/youtube/user_name
+auth-token = /apps/pantheon-photos/sharing/youtube/auth_token
 

=== renamed file 'misc/shotwell.desktop.head' => 'misc/pantheon-photos.desktop.head'
--- misc/shotwell.desktop.head	2013-01-23 01:34:50 +0000
+++ misc/pantheon-photos.desktop.head	2014-02-24 07:36:30 +0000
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Version=1.0
-Name=Shotwell
+Name=Pantheon 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=shotwell %U
-Icon=shotwell
+Exec=pantheon-photos %U
+Icon=pantheon-photos
 Terminal=false
 Type=Application
 MimeType=x-content/image-dcf;
 Categories=Graphics;Photography;GNOME;GTK;
 X-GIO-NoFuse=true
-X-GNOME-Gettext-Domain=shotwell
-X-GNOME-FullName=Shotwell Photo Manager
+X-GNOME-Gettext-Domain=pantheon-photos
+X-GNOME-FullName=Pantheon Photos Photo Manager

=== renamed file 'shotwell-plugin-dev-1.0.m4' => 'pantheon-photos-plugin-dev-1.0.m4'
--- shotwell-plugin-dev-1.0.m4	2011-03-31 21:17:50 +0000
+++ pantheon-photos-plugin-dev-1.0.m4	2014-02-24 07:36:30 +0000
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/_LIB_
 includedir=${prefix}/include
 
-Name: Shotwell Plugin Development
-Description: Headers for building Shotwell plugins
+Name: Pantheon Photos Plugin Development
+Description: Headers for building Pantheon Photos plugins
 Requires: _REQUIREMENTS_
 Version: _VERSION_
-Cflags: -I${includedir}/shotwell
+Cflags: -I${includedir}/pantheon-photos
 

=== modified file 'plugins/Makefile.plugin.mk'
--- plugins/Makefile.plugin.mk	2013-09-24 22:08:27 +0000
+++ plugins/Makefile.plugin.mk	2014-02-24 07:36:30 +0000
@@ -1,5 +1,5 @@
 
-# Generic plug-in Makefile for Shotwell standard plugins.
+# Generic plug-in Makefile for Pantheon Photos standard plugins.
 #
 # Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus extension) and that 
 # the directory is registered in plugins.mk.
@@ -14,19 +14,19 @@
 VALAC := valac
 endif
 MAKE_FILES := Makefile ../Makefile.plugin.mk ../plugins.mk
-HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
-	../shotwell-plugin-dev-1.0.deps
+HEADER_FILES := ../pantheon-photos-plugin-dev-1.0.vapi ../pantheon-photos-plugin-dev-1.0.h \
+	../pantheon-photos-plugin-dev-1.0.deps
 
 include ../plugins.mk
 
-# automatically include shotwell-plugin-dev-1.0's dependencies
+# automatically include pantheon-photos-plugin-dev-1.0's dependencies
 # NOTE: This line will generate an error when running "make dist" from the master Makefile.
 # It can be safely ignored.
-PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKGS)
+PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../pantheon-photos-plugin-dev-1.0.deps) $(PKGS)
 
-# automatically include the shotwell-plugin-dev-1.0 package as a local dependency
+# automatically include the pantheon-photos-plugin-dev-1.0 package as a local dependency
 EXT_PKGS := $(PKGS)
-PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
+PKGS := pantheon-photos-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
 
 # automatically include the Resources.vala common file
 SRC_FILES := ../common/Resources.vala $(SRC_FILES)
@@ -36,7 +36,7 @@
 
 CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
 LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
-DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
+DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"pantheon-photos"'
 
 all: $(PLUGIN).so
 

=== modified file 'plugins/common/RESTSupport.vala'
--- plugins/common/RESTSupport.vala	2013-09-24 22:08:27 +0000
+++ plugins/common/RESTSupport.vala	2014-02-24 07:36:30 +0000
@@ -1135,7 +1135,7 @@
             do_exchange_refresh_token_for_access_token();
         } else {
             if (WebAuthenticationPane.is_cache_dirty()) {
-                host.install_static_message_pane(_("You have already logged in and out of a Google service during this Shotwell session.\n\nTo continue publishing to Google services, quit and restart Shotwell, then try publishing again."));
+                host.install_static_message_pane(_("You have already logged in and out of a Google service during this Pantheon Photos session.\n\nTo continue publishing to Google services, quit and restart Pantheon Photos, then try publishing again."));
                 return;
             }
 

=== modified file 'plugins/common/Resources.vala'
--- plugins/common/Resources.vala	2013-01-21 21:16:09 +0000
+++ plugins/common/Resources.vala	2014-02-24 07:36:30 +0000
@@ -10,18 +10,18 @@
 public const string WEBSITE_URL = "http://www.yorba.org";
 
 public const string LICENSE = """
-Shotwell is free software; you can redistribute it and/or modify it under the 
+Pantheon Photos is free software; you can redistribute it and/or modify it under the 
 terms of the GNU Lesser General Public License as published by the Free 
 Software Foundation; either version 2.1 of the License, or (at your option) 
 any later version.
 
-Shotwell is distributed in the hope that it will be useful, but WITHOUT 
+Pantheon Photos is distributed in the hope that it will be useful, but WITHOUT 
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for 
 more details.
 
 You should have received a copy of the GNU Lesser General Public License 
-along with Shotwell; if not, write to the Free Software Foundation, Inc., 
+along with Pantheon Photos; if not, write to the Free Software Foundation, Inc., 
 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 """;
 

=== renamed directory 'plugins/shotwell-data-imports' => 'plugins/pantheon-photos-data-imports'
=== modified file 'plugins/pantheon-photos-data-imports/FSpotImporter.vala'
--- plugins/shotwell-data-imports/FSpotImporter.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-data-imports/FSpotImporter.vala	2014-02-24 07:36:30 +0000
@@ -22,7 +22,7 @@
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.dataimports.fspot";
+        return "org.pantheon.photos.dataimports.fspot";
     }
 
     public unowned string get_pluggable_name() {
@@ -53,7 +53,7 @@
 
 internal const string SERVICE_NAME = "F-Spot";
 internal const string SERVICE_WELCOME_MESSAGE =
-    _("Welcome to the F-Spot library import service.\n\nPlease select a library to import, either by selecting one of the existing libraries found by Shotwell or by selecting an alternative F-Spot database file.");
+    _("Welcome to the F-Spot library import service.\n\nPlease select a library to import, either by selecting one of the existing libraries found by Pantheon Photos or by selecting an alternative F-Spot database file.");
 internal const string SERVICE_WELCOME_MESSAGE_FILE_ONLY =
     _("Welcome to the F-Spot library import service.\n\nPlease select an F-Spot database file.");
 internal const string FILE_IMPORT_LABEL =
@@ -61,13 +61,13 @@
 internal const string ERROR_CANT_OPEN_DB_FILE =
     _("Cannot open the selected F-Spot database file: the file does not exist or is not an F-Spot database");
 internal const string ERROR_UNSUPPORTED_DB_VERSION =
-    _("Cannot open the selected F-Spot database file: this version of the F-Spot database is not supported by Shotwell");
+    _("Cannot open the selected F-Spot database file: this version of the F-Spot database is not supported by Pantheon Photos");
 internal const string ERROR_CANT_READ_TAGS_TABLE =
     _("Cannot read the selected F-Spot database file: error while reading tags table");
 internal const string ERROR_CANT_READ_PHOTOS_TABLE =
     _("Cannot read the selected F-Spot database file: error while reading photos table");
 internal const string MESSAGE_FINAL_SCREEN =
-    _("Shotwell has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n\nYou can close this dialog and start using Shotwell while the import is taking place in the background.");
+    _("Pantheon Photos has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n\nYou can close this dialog and start using Pantheon Photos while the import is taking place in the background.");
 
 public class FSpotImportableLibrary : Spit.DataImports.ImportableLibrary, GLib.Object {
     private File db_file;
@@ -430,7 +430,7 @@
             FSpotImportableEvent? event = null;
             DataImports.FSpot.Db.FSpotRollRow? roll_row = null;
             
-            // TODO: We do not convert F-Spot events to Shotwell events because F-Spot's events
+            // TODO: We do not convert F-Spot events to Pantheon Photos events because F-Spot's events
             // are essentially tags.  We would need to detect if the tag is an event (use
             // is_tag_event) and then assign the event to the photo ... since a photo can be
             // in multiple F-Spot events, we would need to pick one, and since their tags

=== modified file 'plugins/pantheon-photos-data-imports/Makefile'
--- plugins/shotwell-data-imports/Makefile	2013-04-25 00:53:04 +0000
+++ plugins/pantheon-photos-data-imports/Makefile	2014-02-24 07:36:30 +0000
@@ -1,5 +1,5 @@
 
-PLUGIN := shotwell-data-imports
+PLUGIN := pantheon-photos-data-imports
 
 PLUGIN_PKGS := \
 	gtk+-3.0 \
@@ -8,7 +8,7 @@
 	sqlite3
 
 SRC_FILES := \
-	shotwell-data-imports.vala \
+	pantheon-photos-data-imports.vala \
 	../common/VersionNumber.vala \
 	../common/SqliteSupport.vala \
 	FSpotImporter.vala \

=== renamed file 'plugins/shotwell-data-imports/shotwell-data-imports.vala' => 'plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala'
--- plugins/shotwell-data-imports/shotwell-data-imports.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala	2014-02-24 07:36:30 +0000
@@ -7,12 +7,12 @@
 extern const string _VERSION;
 
 // "core services" are: F-Spot
-private class ShotwellDataImportsCoreServices : Object, Spit.Module {
+private class PantheonPhotosDataImportsCoreServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
     // we need to get a module file handle because our pluggables have to load resources from the
     // module file directory
-    public ShotwellDataImportsCoreServices(GLib.File module_file) {
+    public PantheonPhotosDataImportsCoreServices(GLib.File module_file) {
         GLib.File resource_directory = module_file.get_parent();
         
         pluggables += new FSpotService(resource_directory);
@@ -27,7 +27,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.data_imports.core_services";
+        return "org.pantheon.photos.data_imports.core_services";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
@@ -41,6 +41,6 @@
         params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
     
     return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-        ? new ShotwellDataImportsCoreServices(params->module_file) : null;
+        ? new PantheonPhotosDataImportsCoreServices(params->module_file) : null;
 }
 

=== renamed directory 'plugins/shotwell-publishing' => 'plugins/pantheon-photos-publishing'
=== renamed directory 'plugins/shotwell-publishing-extras' => 'plugins/pantheon-photos-publishing-extras'
=== modified file 'plugins/pantheon-photos-publishing-extras/Makefile'
--- plugins/shotwell-publishing-extras/Makefile	2013-04-25 00:53:04 +0000
+++ plugins/pantheon-photos-publishing-extras/Makefile	2014-02-24 07:36:30 +0000
@@ -1,5 +1,5 @@
 
-PLUGIN := shotwell-publishing-extras
+PLUGIN := pantheon-photos-publishing-extras
 
 PLUGIN_PKGS := \
 	gtk+-3.0 \
@@ -11,7 +11,7 @@
 	json-glib-1.0
 
 SRC_FILES := \
-	shotwell-publishing-extras.vala \
+	pantheon-photos-publishing-extras.vala \
 	YandexPublishing.vala \
 	TumblrPublishing.vala \
 	../../src/util/string.vala \

=== modified file 'plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala'
--- plugins/shotwell-publishing-extras/TumblrPublishing.vala	2014-01-15 19:51:09 +0000
+++ plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala	2014-02-24 07:36:30 +0000
@@ -23,7 +23,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.tumblr";
+        return "org.pantheon.photos.publishing.tumblr";
     }
     
     public unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-publishing-extras/YandexPublishing.vala'
--- plugins/shotwell-publishing-extras/YandexPublishing.vala	2014-01-15 19:51:09 +0000
+++ plugins/pantheon-photos-publishing-extras/YandexPublishing.vala	2014-02-24 07:36:30 +0000
@@ -10,7 +10,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.yandex-fotki";
+        return "org.pantheon.photos.publishing.yandex-fotki";
     }
     
     public unowned string get_pluggable_name() {

=== renamed file 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala' => 'plugins/pantheon-photos-publishing-extras/pantheon-photos-publishing-extras.vala'
--- plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala	2014-01-15 19:51:09 +0000
+++ plugins/pantheon-photos-publishing-extras/pantheon-photos-publishing-extras.vala	2014-02-24 07:36:30 +0000
@@ -6,16 +6,16 @@
 
 extern const string _VERSION;
 
-private class ShotwellPublishingExtraServices : Object, Spit.Module {
+private class PantheonPhotosPublishingExtraServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
-    public ShotwellPublishingExtraServices(GLib.File module_file) {
+    public PantheonPhotosPublishingExtraServices(GLib.File module_file) {
         pluggables += new YandexService();
         pluggables += new TumblrService(module_file.get_parent());
     }
     
     public unowned string get_module_name() {
-        return _("Shotwell Extra Publishing Services");
+        return _("Pantheon Photos Extra Publishing Services");
     }
     
     public unowned string get_version() {
@@ -23,7 +23,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.extras";
+        return "org.pantheon.photos.publishing.extras";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
@@ -37,6 +37,6 @@
         params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
     
     return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-        ? new ShotwellPublishingExtraServices(params->module_file) : null;
+        ? new PantheonPhotosPublishingExtraServices(params->module_file) : null;
 }
 

=== modified file 'plugins/pantheon-photos-publishing/FacebookPublishing.vala'
--- plugins/shotwell-publishing/FacebookPublishing.vala	2013-09-24 22:08:27 +0000
+++ plugins/pantheon-photos-publishing/FacebookPublishing.vala	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.facebook";
+        return "org.pantheon.photos.publishing.facebook";
     }
 
     public unowned string get_pluggable_name() {
@@ -58,11 +58,11 @@
 public const string SERVICE_NAME = "facebook";
 internal const string USER_VISIBLE_NAME = "Facebook";
 internal const string APPLICATION_ID = "162702932093";
-internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
+internal const string DEFAULT_ALBUM_NAME = _("Pantheon Photos Connect");
 internal const string SERVICE_WELCOME_MESSAGE =
-    _("You are not currently logged into Facebook.\n\nIf you don't yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function.");
+    _("You are not currently logged into Facebook.\n\nIf you don't yet have a Facebook account, you can create one during the login process. During login, Pantheon Photos Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Pantheon Photos Connect to function.");
 internal const string RESTART_ERROR_MESSAGE =
-    _("You have already logged in and out of Facebook during this Shotwell session.\nTo continue publishing to Facebook, quit and restart Shotwell, then try publishing again.");
+    _("You have already logged in and out of Facebook during this Pantheon Photos session.\nTo continue publishing to Facebook, quit and restart Pantheon Photos, then try publishing again.");
 internal const string USER_AGENT = "Java/1.6.0_16";
 internal const int EXPIRED_SESSION_STATUS_CODE = 400;
 

=== modified file 'plugins/pantheon-photos-publishing/FlickrPublishing.vala'
--- plugins/shotwell-publishing/FlickrPublishing.vala	2013-04-25 00:53:04 +0000
+++ plugins/pantheon-photos-publishing/FlickrPublishing.vala	2014-02-24 07:36:30 +0000
@@ -22,7 +22,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.flickr";
+        return "org.pantheon.photos.publishing.flickr";
     }
     
     public unowned string get_pluggable_name() {
@@ -58,9 +58,9 @@
 
 internal const string SERVICE_NAME = "Flickr";
 internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Flickr.\n\nClick Login to log into Flickr in your Web browser.  You will have to authorize Shotwell Connect to link to your Flickr account.");
+    _("You are not currently logged into Flickr.\n\nClick Login to log into Flickr in your Web browser.  You will have to authorize Pantheon Photos Connect to link to your Flickr account.");
 internal const string RESTART_ERROR_MESSAGE = 
-    _("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to Flickr, quit and restart Shotwell, then try publishing again.");
+    _("You have already logged in and out of Flickr during this Pantheon Photos session.\nTo continue publishing to Flickr, quit and restart Pantheon Photos, then try publishing again.");
 internal const string ENDPOINT_URL = "http://api.flickr.com/services/rest";
 internal const string API_KEY = "60dd96d4a2ad04888b09c9e18d82c26f";
 internal const string API_SECRET = "d0960565e03547c1";

=== modified file 'plugins/pantheon-photos-publishing/Makefile'
--- plugins/shotwell-publishing/Makefile	2013-05-09 19:31:00 +0000
+++ plugins/pantheon-photos-publishing/Makefile	2014-02-24 07:36:30 +0000
@@ -1,5 +1,5 @@
 
-PLUGIN := shotwell-publishing
+PLUGIN := pantheon-photos-publishing
 
 PLUGIN_PKGS := \
 	gtk+-3.0 \
@@ -12,7 +12,7 @@
 	json-glib-1.0
 
 SRC_FILES := \
-	shotwell-publishing.vala \
+	pantheon-photos-publishing.vala \
 	FacebookPublishing.vala \
 	PicasaPublishing.vala \
 	FlickrPublishing.vala \

=== modified file 'plugins/pantheon-photos-publishing/PicasaPublishing.vala'
--- plugins/shotwell-publishing/PicasaPublishing.vala	2013-06-17 22:58:17 +0000
+++ plugins/pantheon-photos-publishing/PicasaPublishing.vala	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.picasa";
+        return "org.pantheon.photos.publishing.picasa";
     }
     
     public unowned string get_pluggable_name() {
@@ -55,8 +55,8 @@
 namespace Publishing.Picasa {
 
 internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Picasa Web Albums.\n\nClick Login to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account.");
-internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
+    _("You are not currently logged into Picasa Web Albums.\n\nClick Login to log into Picasa Web Albums in your Web browser. You will have to authorize Pantheon Photos Connect to link to your Picasa Web Albums account.");
+internal const string DEFAULT_ALBUM_NAME = _("Pantheon Photos Connect");
 
 public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
     private bool running;

=== modified file 'plugins/pantheon-photos-publishing/PiwigoPublishing.vala'
--- plugins/shotwell-publishing/PiwigoPublishing.vala	2013-02-25 22:09:55 +0000
+++ plugins/pantheon-photos-publishing/PiwigoPublishing.vala	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.piwigo";
+        return "org.pantheon.photos.publishing.piwigo";
     }
     
     public unowned string get_pluggable_name() {
@@ -996,7 +996,7 @@
         FAILED_RETRY_USER
     }
     private static string INTRO_MESSAGE = _("Enter the URL of your Piwigo photo library as well as the username and password associated with your Piwigo account for that library.");
-    private static string FAILED_RETRY_URL_MESSAGE = _("Shotwell cannot contact your Piwigo photo library. Please verify the URL you entered");
+    private static string FAILED_RETRY_URL_MESSAGE = _("Pantheon Photos cannot contact your Piwigo photo library. Please verify the URL you entered");
     private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
 
     private Gtk.Box pane_widget = null;
@@ -1124,7 +1124,7 @@
  */
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
 
-    private static string DEFAULT_CATEGORY_NAME = _("Shotwell Connect");
+    private static string DEFAULT_CATEGORY_NAME = _("Pantheon Photos Connect");
 
     private Gtk.Box pane_widget = null;
     private Gtk.Builder builder;

=== modified file 'plugins/pantheon-photos-publishing/YouTubePublishing.vala'
--- plugins/shotwell-publishing/YouTubePublishing.vala	2013-05-09 19:31:00 +0000
+++ plugins/pantheon-photos-publishing/YouTubePublishing.vala	2014-02-24 07:36:30 +0000
@@ -20,7 +20,7 @@
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.youtube";
+        return "org.pantheon.photos.publishing.youtube";
     }
 
     public unowned string get_pluggable_name() {

=== renamed file 'plugins/shotwell-publishing/shotwell-publishing.vala' => 'plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala'
--- plugins/shotwell-publishing/shotwell-publishing.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala	2014-02-24 07:36:30 +0000
@@ -7,12 +7,12 @@
 extern const string _VERSION;
 
 // "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube
-private class ShotwellPublishingCoreServices : Object, Spit.Module {
+private class PantheonPhotosPublishingCoreServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
     // we need to get a module file handle because our pluggables have to load resources from the
     // module file directory
-    public ShotwellPublishingCoreServices(GLib.File module_file) {
+    public PantheonPhotosPublishingCoreServices(GLib.File module_file) {
         GLib.File resource_directory = module_file.get_parent();
         
         pluggables += new FacebookService(resource_directory);
@@ -31,7 +31,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.core_services";
+        return "org.pantheon.photos.publishing.core_services";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
@@ -45,6 +45,6 @@
         params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
     
     return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-        ? new ShotwellPublishingCoreServices(params->module_file) : null;
+        ? new PantheonPhotosPublishingCoreServices(params->module_file) : null;
 }
 

=== renamed directory 'plugins/shotwell-transitions' => 'plugins/pantheon-photos-transitions'
=== modified file 'plugins/pantheon-photos-transitions/BlindsEffect.vala'
--- plugins/shotwell-transitions/BlindsEffect.vala	2013-02-13 19:25:42 +0000
+++ plugins/pantheon-photos-transitions/BlindsEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class BlindsEffectDescriptor : ShotwellTransitionDescriptor {
+private class BlindsEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public BlindsEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.blinds";
+        return "org.pantheon.photos.transitions.blinds";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/ChessEffect.vala'
--- plugins/shotwell-transitions/ChessEffect.vala	2013-02-22 21:39:23 +0000
+++ plugins/pantheon-photos-transitions/ChessEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class ChessEffectDescriptor : ShotwellTransitionDescriptor {
+private class ChessEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public ChessEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.chess";
+        return "org.pantheon.photos.transitions.chess";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/CircleEffect.vala'
--- plugins/shotwell-transitions/CircleEffect.vala	2013-02-13 19:25:42 +0000
+++ plugins/pantheon-photos-transitions/CircleEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class CircleEffectDescriptor : ShotwellTransitionDescriptor {
+private class CircleEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public CircleEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.circle";
+        return "org.pantheon.photos.transitions.circle";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/CirclesEffect.vala'
--- plugins/shotwell-transitions/CirclesEffect.vala	2013-02-13 19:25:42 +0000
+++ plugins/pantheon-photos-transitions/CirclesEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class CirclesEffectDescriptor : ShotwellTransitionDescriptor {
+private class CirclesEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public CirclesEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.circles";
+        return "org.pantheon.photos.transitions.circles";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/ClockEffect.vala'
--- plugins/shotwell-transitions/ClockEffect.vala	2013-02-13 19:25:42 +0000
+++ plugins/pantheon-photos-transitions/ClockEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class ClockEffectDescriptor : ShotwellTransitionDescriptor {
+private class ClockEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public ClockEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.clock";
+        return "org.pantheon.photos.transitions.clock";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/CrumbleEffect.vala'
--- plugins/shotwell-transitions/CrumbleEffect.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-transitions/CrumbleEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class CrumbleEffectDescriptor : ShotwellTransitionDescriptor {
+private class CrumbleEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public CrumbleEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.crumble";
+        return "org.pantheon.photos.transitions.crumble";
     }
     
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/FadeEffect.vala'
--- plugins/shotwell-transitions/FadeEffect.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-transitions/FadeEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class FadeEffectDescriptor : ShotwellTransitionDescriptor {
+private class FadeEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public FadeEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.fade";
+        return "org.pantheon.photos.transitions.fade";
     }
     
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/Makefile'
--- plugins/shotwell-transitions/Makefile	2013-02-22 21:39:23 +0000
+++ plugins/pantheon-photos-transitions/Makefile	2014-02-24 07:36:30 +0000
@@ -1,8 +1,8 @@
 
-PLUGIN := shotwell-transitions
+PLUGIN := pantheon-photos-transitions
 
 SRC_FILES := \
-	shotwell-transitions.vala \
+	pantheon-photos-transitions.vala \
 	FadeEffect.vala \
 	SlideEffect.vala \
 	CrumbleEffect.vala \

=== modified file 'plugins/pantheon-photos-transitions/SlideEffect.vala'
--- plugins/shotwell-transitions/SlideEffect.vala	2013-01-21 21:16:09 +0000
+++ plugins/pantheon-photos-transitions/SlideEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class SlideEffectDescriptor : ShotwellTransitionDescriptor {
+private class SlideEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public SlideEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.slide";
+        return "org.pantheon.photos.transitions.slide";
     }
     
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/SquaresEffect.vala'
--- plugins/shotwell-transitions/SquaresEffect.vala	2013-02-22 21:39:23 +0000
+++ plugins/pantheon-photos-transitions/SquaresEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class SquaresEffectDescriptor : ShotwellTransitionDescriptor {
+private class SquaresEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public SquaresEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.squares";
+        return "org.pantheon.photos.transitions.squares";
     }
 
     public override unowned string get_pluggable_name() {

=== modified file 'plugins/pantheon-photos-transitions/StripesEffect.vala'
--- plugins/shotwell-transitions/StripesEffect.vala	2013-02-22 21:39:23 +0000
+++ plugins/pantheon-photos-transitions/StripesEffect.vala	2014-02-24 07:36:30 +0000
@@ -7,13 +7,13 @@
 
 using Spit;
 
-private class StripesEffectDescriptor : ShotwellTransitionDescriptor {
+private class StripesEffectDescriptor : PantheonPhotosTransitionDescriptor {
     public StripesEffectDescriptor(GLib.File resource_directory) {
         base(resource_directory);
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.stripes";
+        return "org.pantheon.photos.transitions.stripes";
     }
 
     public override unowned string get_pluggable_name() {

=== renamed file 'plugins/shotwell-transitions/shotwell-transitions.vala' => 'plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala'
--- plugins/shotwell-transitions/shotwell-transitions.vala	2013-02-22 21:39:23 +0000
+++ plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala	2014-02-24 07:36:30 +0000
@@ -6,10 +6,10 @@
 
 extern const string _VERSION;
 
-private class ShotwellTransitions : Object, Spit.Module {
+private class PantheonPhotosTransitions : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
-    public ShotwellTransitions(GLib.File module_file) {
+    public PantheonPhotosTransitions(GLib.File module_file) {
         GLib.File resource_directory = module_file.get_parent();
 
         pluggables += new FadeEffectDescriptor(resource_directory);
@@ -33,7 +33,7 @@
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.transitions";
+        return "org.pantheon.photos.transitions";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
@@ -47,16 +47,16 @@
         params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
     
     return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-        ? new ShotwellTransitions(params->module_file) : null;
+        ? new PantheonPhotosTransitions(params->module_file) : null;
 }
 
 // Base class for all transition descriptors in this module
-public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
+public abstract class PantheonPhotosTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
     private const string ICON_FILENAME = "slideshow-plugin.png";
 
     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
     
-    public ShotwellTransitionDescriptor(GLib.File resource_directory) {
+    public PantheonPhotosTransitionDescriptor(GLib.File resource_directory) {
         if (icon_pixbuf_set == null)
             icon_pixbuf_set = Resources.load_icon_set(resource_directory.get_child(ICON_FILENAME));
     }

=== modified file 'plugins/plugins.mk'
--- plugins/plugins.mk	2013-11-14 22:27:35 +0000
+++ plugins/plugins.mk	2014-02-24 07:36:30 +0000
@@ -1,33 +1,33 @@
 
 PLUGINS := \
-	shotwell-transitions \
-	shotwell-publishing \
-	shotwell-data-imports
+	pantheon-photos-transitions \
+	pantheon-photos-publishing \
+	pantheon-photos-data-imports
 
 PLUGINS_RC := \
-	plugins/shotwell-publishing/facebook.png \
-	plugins/shotwell-publishing/facebook_publishing_options_pane.glade \
-	plugins/shotwell-publishing/flickr.png \
-	plugins/shotwell-publishing/flickr_publishing_options_pane.glade \
-	plugins/shotwell-publishing/flickr_pin_entry_pane.glade \
-	plugins/shotwell-publishing/picasa.png \
-	plugins/shotwell-publishing/picasa_publishing_options_pane.glade \
-	plugins/shotwell-publishing/youtube.png \
-	plugins/shotwell-publishing/youtube_publishing_options_pane.glade \
-	plugins/shotwell-publishing/piwigo.png \
-	plugins/shotwell-publishing/piwigo_authentication_pane.glade \
-	plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \
-	plugins/shotwell-transitions/slideshow-plugin.png
+	plugins/pantheon-photos-publishing/facebook.png \
+	plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/flickr.png \
+	plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade \
+	plugins/pantheon-photos-publishing/picasa.png \
+	plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/youtube.png \
+	plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/piwigo.png \
+	plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade \
+	plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade \
+	plugins/pantheon-photos-transitions/slideshow-plugin.png
 
 EXTRA_PLUGINS := \
-	shotwell-publishing-extras
+	pantheon-photos-publishing-extras
 
 EXTRA_PLUGINS_RC := \
-	plugins/shotwell-publishing-extras/yandex_publish_model.glade \
-	plugins/shotwell-data-imports/f-spot-24.png \
-	plugins/shotwell-publishing-extras/tumblr.png \
-	plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
+	plugins/pantheon-photos-publishing-extras/yandex_publish_model.glade \
+	plugins/pantheon-photos-data-imports/f-spot-24.png \
+	plugins/pantheon-photos-publishing-extras/tumblr.png \
+	plugins/pantheon-photos-publishing-extras/tumblr_authentication_pane.glade \
+	plugins/pantheon-photos-publishing-extras/tumblr_publishing_options_pane.glade
 
 ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS)
 

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-01-15 19:51:09 +0000
+++ po/POTFILES.in	2014-02-24 07:36:30 +0000
@@ -3,48 +3,48 @@
 plugins/common/Resources.vala
 plugins/common/SqliteSupport.vala
 plugins/common/VersionNumber.vala
-plugins/shotwell-data-imports/FSpotDatabase.vala
-plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
-plugins/shotwell-data-imports/FSpotDatabaseTable.vala
-plugins/shotwell-data-imports/FSpotImporter.vala
-plugins/shotwell-data-imports/FSpotMetaTable.vala
-plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
-plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
-plugins/shotwell-data-imports/FSpotPhotosTable.vala
-plugins/shotwell-data-imports/FSpotRollsTable.vala
-plugins/shotwell-data-imports/FSpotTableBehavior.vala
-plugins/shotwell-data-imports/FSpotTagsTable.vala
-plugins/shotwell-data-imports/shotwell-data-imports.vala
-plugins/shotwell-publishing-extras/TumblrPublishing.vala
-plugins/shotwell-publishing-extras/YandexPublishing.vala
-plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade
-plugins/shotwell-publishing/FacebookPublishing.vala
-plugins/shotwell-publishing/FlickrPublishing.vala
-plugins/shotwell-publishing/PicasaPublishing.vala
-plugins/shotwell-publishing/PiwigoPublishing.vala
-plugins/shotwell-publishing/YouTubePublishing.vala
-[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade
-[type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade
-plugins/shotwell-publishing/shotwell-publishing.vala
-[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade
-plugins/shotwell-transitions/BlindsEffect.vala
-plugins/shotwell-transitions/ChessEffect.vala
-plugins/shotwell-transitions/CircleEffect.vala
-plugins/shotwell-transitions/CirclesEffect.vala
-plugins/shotwell-transitions/ClockEffect.vala
-plugins/shotwell-transitions/CrumbleEffect.vala
-plugins/shotwell-transitions/FadeEffect.vala
-plugins/shotwell-transitions/SlideEffect.vala
-plugins/shotwell-transitions/SquaresEffect.vala
-plugins/shotwell-transitions/StripesEffect.vala
-plugins/shotwell-transitions/shotwell-transitions.vala
+plugins/pantheon-photos-data-imports/FSpotDatabase.vala
+plugins/pantheon-photos-data-imports/FSpotDatabaseBehavior.vala
+plugins/pantheon-photos-data-imports/FSpotDatabaseTable.vala
+plugins/pantheon-photos-data-imports/FSpotImporter.vala
+plugins/pantheon-photos-data-imports/FSpotMetaTable.vala
+plugins/pantheon-photos-data-imports/FSpotPhotoTagsTable.vala
+plugins/pantheon-photos-data-imports/FSpotPhotoVersionsTable.vala
+plugins/pantheon-photos-data-imports/FSpotPhotosTable.vala
+plugins/pantheon-photos-data-imports/FSpotRollsTable.vala
+plugins/pantheon-photos-data-imports/FSpotTableBehavior.vala
+plugins/pantheon-photos-data-imports/FSpotTagsTable.vala
+plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala
+plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala
+plugins/pantheon-photos-publishing-extras/YandexPublishing.vala
+plugins/pantheon-photos-publishing-extras/pantheon-photos-publishing-extras.vala
+[type: gettext/glade]plugins/pantheon-photos-publishing-extras/tumblr_authentication_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing-extras/tumblr_publishing_options_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing-extras/yandex_publish_model.glade
+plugins/pantheon-photos-publishing/FacebookPublishing.vala
+plugins/pantheon-photos-publishing/FlickrPublishing.vala
+plugins/pantheon-photos-publishing/PicasaPublishing.vala
+plugins/pantheon-photos-publishing/PiwigoPublishing.vala
+plugins/pantheon-photos-publishing/YouTubePublishing.vala
+[type: gettext/glade]plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade
+[type: gettext/glade]plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade
+plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala
+[type: gettext/glade]plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade
+plugins/pantheon-photos-transitions/BlindsEffect.vala
+plugins/pantheon-photos-transitions/ChessEffect.vala
+plugins/pantheon-photos-transitions/CircleEffect.vala
+plugins/pantheon-photos-transitions/CirclesEffect.vala
+plugins/pantheon-photos-transitions/ClockEffect.vala
+plugins/pantheon-photos-transitions/CrumbleEffect.vala
+plugins/pantheon-photos-transitions/FadeEffect.vala
+plugins/pantheon-photos-transitions/SlideEffect.vala
+plugins/pantheon-photos-transitions/SquaresEffect.vala
+plugins/pantheon-photos-transitions/StripesEffect.vala
+plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala
 src/AppDirs.vala
 src/AppWindow.vala
 src/Application.vala
@@ -219,4 +219,4 @@
 src/util/system.vala
 src/util/ui.vala
 [type: gettext/glade]ui/set_background_dialog.glade
-[type: gettext/glade]ui/shotwell.glade
+[type: gettext/glade]ui/pantheon-photos.glade

=== modified file 'po/af.po'
--- po/af.po	2014-01-15 19:51:09 +0000
+++ po/af.po	2014-02-24 07:36:30 +0000
@@ -1,5 +1,5 @@
-# po/shotwell-core/shotwell.pot
-# PO message string template file for Shotwell Core Components
+# po/pantheon-photos-core/pantheon-photos.pot
+# PO message string template file for Pantheon Photos Core Components
 # Copyright (C) 2009-2013 Yorba Foundation
 # See COPYING for license.
 # 
@@ -8,12 +8,12 @@
 # lombaardcj <[e-mail]>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Project-Id-Version: pantheon-photos-0.15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2013-09-20 11:55-0700\n"
 "PO-Revision-Date: 2013-09-20 19:13+0000\n"
 "Last-Translator: yorbajim <[e-mail]>\n"
-"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/shotwell/language/af_ZA/)\n"
+"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/pantheon-photos/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +83,7 @@
 
 #: src/camera/ImportPage.vala:1012
 msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
+"Pantheon Photos needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
 msgstr ""
 
@@ -97,7 +97,7 @@
 
 #: src/camera/ImportPage.vala:1028
 msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
+"The camera is locked by another application.  Pantheon Photos can only access the "
 "camera when it's unlocked.  Please close any other application using the "
 "camera and try again."
 msgstr ""
@@ -395,39 +395,39 @@
 #: src/main.vala:54
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Your photo library is not compatible with this version of Pantheon Photos.  It "
+"appears it was created by Pantheon Photos %s (schema %d).  This version is %s "
+"(schema %d).  Please use the latest version of Pantheon Photos."
 msgstr ""
 
 #: src/main.vala:59
 #, c-format
 msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
+"Pantheon Photos was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d).  For more information please check the Pantheon Photos Wiki "
 "at %s"
 msgstr ""
 
 #: src/main.vala:65
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
+"Your photo library is not compatible with this version of Pantheon Photos.  It "
+"appears it was created by Pantheon Photos %s (schema %d).  This version is %s "
 "(schema %d).  Please clear your library by deleting %s and re-import your "
 "photos."
 msgstr ""
 
 #: src/main.vala:71
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Pantheon Photos's database: %s"
 msgstr ""
 
 #: src/main.vala:104
-msgid "Loading Shotwell"
+msgid "Loading Pantheon Photos"
 msgstr ""
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+msgid "Path to Pantheon Photos's private data"
 msgstr ""
 
 #: src/main.vala:294
@@ -630,10 +630,10 @@
 #, c-format
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
-"Shotwell"
+"Pantheon Photos"
 msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
-"Shotwell"
+"Pantheon Photos"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -648,7 +648,7 @@
 #: src/Dialogs.vala:115
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Pantheon Photos couldn't create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 
@@ -752,13 +752,13 @@
 
 #: src/Dialogs.vala:597
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren't in a Format Pantheon Photos "
 "Understands:"
 msgstr ""
 
 #: src/Dialogs.vala:612
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Pantheon Photos Couldn't Copy Them into its "
 "Library:"
 msgstr ""
 
@@ -1209,8 +1209,8 @@
 
 #: src/Dialogs.vala:2021
 #, c-format
-msgid "Welcome to Shotwell!"
-msgstr "Welkom by Shotwell!"
+msgid "Welcome to Pantheon Photos!"
+msgstr "Welkom by Pantheon Photos!"
 
 #: src/Dialogs.vala:2025
 #, c-format
@@ -1223,7 +1223,7 @@
 msgstr "Kies <span weight=\"bold\">Lêer %s Voer in vanaf lêerhouer</span>"
 
 #: src/Dialogs.vala:2045
-msgid "Drag and drop photos onto the Shotwell window"
+msgid "Drag and drop photos onto the Pantheon Photos window"
 msgstr ""
 
 #: src/Dialogs.vala:2046
@@ -1281,9 +1281,9 @@
 
 #: src/Dialogs.vala:2612
 msgid ""
-"Shotwell can copy the photos into your library folder or it can import them "
+"Pantheon Photos can copy the photos into your library folder or it can import them "
 "without copying."
-msgstr "Shotwell kan foto kopieer na d biblioteek of invoer sonder om te kopieer."
+msgstr "Pantheon Photos kan foto kopieer na d biblioteek of invoer sonder om te kopieer."
 
 #: src/Dialogs.vala:2617
 msgid "Co_py Photos"
@@ -1312,11 +1312,11 @@
 #: src/Dialogs.vala:2644
 #, c-format
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also like to move the file to your desktop trash?\n"
+"This will remove the photo/video from your Pantheon Photos library.  Would you also like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Pantheon Photos library.  Would you also like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -1325,11 +1325,11 @@
 #: src/Dialogs.vala:2648
 #, c-format
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like to move the file to your desktop trash?\n"
+"This will remove the video from your Pantheon Photos library.  Would you also like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n"
+"This will remove %d videos from your Pantheon Photos library.  Would you also like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -1338,11 +1338,11 @@
 #: src/Dialogs.vala:2652
 #, c-format
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like to move the file to your desktop trash?\n"
+"This will remove the photo from your Pantheon Photos library.  Would you also like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n"
+"This will remove %d photos from your Pantheon Photos library.  Would you also like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -1758,12 +1758,12 @@
 msgstr "Haal Fotos uit die Asblik"
 
 #: src/Commands.vala:2336
-msgid "Move the photos to the Shotwell trash"
-msgstr "Skuif die fotos na die Shotwell asblik"
+msgid "Move the photos to the Pantheon Photos trash"
+msgstr "Skuif die fotos na die Pantheon Photos asblik"
 
 #: src/Commands.vala:2336
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Haal fotos uit die Shotwell asblik terug in die biblioteek"
+msgid "Restore the photos back to the Pantheon Photos library"
+msgstr "Haal fotos uit die Pantheon Photos asblik terug in die biblioteek"
 
 #: src/Commands.vala:2355
 msgid "Moving Photos to Trash"
@@ -1802,7 +1802,7 @@
 msgstr ""
 
 #: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
-msgid "Shotwell"
+msgid "Pantheon Photos"
 msgstr ""
 
 #: src/photos/BmpSupport.vala:32
@@ -2169,7 +2169,7 @@
 msgstr ""
 
 #: src/library/LibraryWindow.vala:896
-msgid "Shotwell is configured to import photos to your home directory.\n"
+msgid "Pantheon Photos is configured to import photos to your home directory.\n"
 msgstr ""
 
 #: src/library/LibraryWindow.vala:899
@@ -2298,12 +2298,12 @@
 msgid "Photo Viewer"
 msgstr "Besigtig Foto"
 
-#: src/Resources.vala:27 plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: plugins/shotwell-data-imports/FSpotImporter.vala:34
+#: src/Resources.vala:27 plugins/pantheon-photos-publishing/YouTubePublishing.vala:32
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:34
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:32
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:32
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:32
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:34
 msgid "Copyright 2009-2013 Yorba Foundation"
 msgstr ""
 
@@ -3013,7 +3013,7 @@
 msgstr "Skerm"
 
 #: src/editing_tools/EditingTools.vala:752
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:750
 msgid "Original Size"
 msgstr "Oorspronklike grootte"
 
@@ -3155,10 +3155,10 @@
 #: src/AppWindow.vala:663
 #, c-format
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot continue.\n"
+"A fatal error occurred when accessing Pantheon Photos's library.  Pantheon Photos cannot continue.\n"
 "\n"
 "%s"
-msgstr "'n Fatale fout het voorgekom terwyl toegang tot Shotwell se biblioteek. Shotwell kan nie voortgaan nie. \n\n%s"
+msgstr "'n Fatale fout het voorgekom terwyl toegang tot Pantheon Photos se biblioteek. Pantheon Photos kan nie voortgaan nie. \n\n%s"
 
 #: src/AppWindow.vala:683 plugins/common/Resources.vala:9
 msgid "Visit the Yorba web site"
@@ -3188,8 +3188,8 @@
 msgstr ""
 
 #: src/Dimensions.vala:17
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1233
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1250
 msgid "Original size"
 msgstr "Oorspronklike grootte"
 
@@ -3268,7 +3268,7 @@
 #: src/MediaPage.vala:702
 #, c-format
 msgid ""
-"Shotwell was unable to play the selected video:\n"
+"Pantheon Photos was unable to play the selected video:\n"
 "%s"
 msgstr ""
 
@@ -3469,7 +3469,7 @@
 #: src/publishing/PublishingUI.vala:384
 #, c-format
 msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
+"Pantheon Photos cannot publish the selected items because you do not have a "
 "compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
 "Preferences</b> and enable one or more of the publishing plugins on the "
 "<b>Plugins</b> tab."
@@ -3503,413 +3503,413 @@
 
 #: plugins/common/RESTSupport.vala:1138
 msgid ""
-"You have already logged in and out of a Google service during this Shotwell session.\n"
+"You have already logged in and out of a Google service during this Pantheon Photos session.\n"
 "\n"
-"To continue publishing to Google services, quit and restart Shotwell, then try publishing again."
+"To continue publishing to Google services, quit and restart Pantheon Photos, then try publishing again."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:57
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
 "You must have already signed up for a Google account and set it up for use with YouTube to continue. You can set up most accounts by using your browser to log into the YouTube site at least once."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:362
 msgid ""
 "A file required for publishing is unavailable. Publishing to Youtube can't "
 "continue."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:461
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:463
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:463
 #, c-format
 msgid "Videos will appear in '%s'"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:495
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:495
 msgid "Public listed"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:496
 msgid "Public unlisted"
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/pantheon-photos-publishing/YouTubePublishing.vala:497
 msgid "Private"
 msgstr ""
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala:26
 msgid "Core Publishing Services"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:61
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:61
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Login to log into Flickr in your Web browser.  You will have to authorize Shotwell Connect to link to your Flickr account."
+"Click Login to log into Flickr in your Web browser.  You will have to authorize Pantheon Photos Connect to link to your Flickr account."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:63
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:63
 msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try publishing again."
+"You have already logged in and out of Flickr during this Pantheon Photos session.\n"
+"To continue publishing to Flickr, quit and restart Pantheon Photos, then try publishing again."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:375
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:375
 msgid "Preparing for login..."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:595
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:444
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:595
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can't "
 "continue."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:457
 msgid "Verifying authorization..."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1153
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1155
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month, you have %d megabytes remaining in your upload quota."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1157
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1162
 msgid "Photos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1164
 msgid "Videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1167
 msgid "Photos and videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1207
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1234
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1182
 msgid "Everyone"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1208
 msgid "Friends & family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1209
 msgid "Family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1210
 msgid "Friends only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1211
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1180
 msgid "Just me"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1229
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1230
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1231
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+#: plugins/pantheon-photos-publishing/FlickrPublishing.vala:1232
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:746
 #, c-format
 msgid "Creating album %s..."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:917
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:998
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:999
 msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you"
+"Pantheon Photos cannot contact your Piwigo photo library. Please verify the URL you"
 " entered"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1000
 msgid "Username and/or password invalid. Please try again"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1032
 #, c-format
 msgid "Invalid URL"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1037
 #, c-format
 msgid "Invalid User Name or Password"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:61
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1127
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:59
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:61
+msgid "Pantheon Photos Connect"
+msgstr "Pantheon Photos Connect"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1235
 msgid "Admins, Family, Friends, Contacts"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1236
 msgid "Admins, Family, Friends"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1237
 msgid "Admins, Family"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/pantheon-photos-publishing/PiwigoPublishing.vala:1238
 msgid "Admins"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:58
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Login to log into Picasa Web Albums in your Web browser. You will have to authorize Pantheon Photos Connect to link to your Picasa Web Albums account."
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:361
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can't "
 "continue."
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#: plugins/shotwell-publishing/FacebookPublishing.vala:347
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:379
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:347
 msgid "Creating album..."
 msgstr "Nuwe album ..."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:659
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:665
 msgid "Videos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:670
 msgid "Photos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:746
 msgid "Small (640 x 480 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:747
 msgid "Medium (1024 x 768 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:748
 msgid "Recommended (1600 x 1200 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/pantheon-photos-publishing/PicasaPublishing.vala:749
 msgid "Google+ (2048 x 1536 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:63
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function."
-msgstr "Jy is tans nie in geteken in Facebook nie. As jy nog nie 'n Facebook-rekening het, kan u een skep tydens die aanmelding. Tydens die inskrywing, kan Shotwell Connect u vra vir toestemming om fotos te laai en publiseer. Hierdie regte is nodig vir Shotwell Connect om te funksioneer."
+"If you don't yet have a Facebook account, you can create one during the login process. During login, Pantheon Photos Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Pantheon Photos Connect to function."
+msgstr "Jy is tans nie in geteken in Facebook nie. As jy nog nie 'n Facebook-rekening het, kan u een skep tydens die aanmelding. Tydens die inskrywing, kan Pantheon Photos Connect u vra vir toestemming om fotos te laai en publiseer. Hierdie regte is nodig vir Pantheon Photos Connect om te funksioneer."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:65
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:65
 msgid ""
-"You have already logged in and out of Facebook during this Shotwell session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try publishing again."
-msgstr "Jy het reeds in en uit geteken na Facebook tydens hierdie Shotwell sessie. Om voort te gaan met die publikasie na Facebook af te sluit en weer Shotwell te begin, probeer om dan weer te publiseer."
+"You have already logged in and out of Facebook during this Pantheon Photos session.\n"
+"To continue publishing to Facebook, quit and restart Pantheon Photos, then try publishing again."
+msgstr "Jy het reeds in en uit geteken na Facebook tydens hierdie Pantheon Photos sessie. Om voort te gaan met die publikasie na Facebook af te sluit en weer Pantheon Photos te begin, probeer om dan weer te publiseer."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:86
 msgid "Standard (720 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:89
 msgid "Large (2048 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:254
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:254
 msgid "Testing connection to Facebook..."
 msgstr "Aansluiting by Facebook toets ..."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:374
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can't "
 "continue."
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1019
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
 msgstr "U is aangeteken in Facebook as %s.\n\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1020
 msgid "Where would you like to publish the selected photos?"
 msgstr "Waar wil jy die geselekteerde fotos heen publiseer?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1021
 msgid "Upload _size:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1181
+#: plugins/pantheon-photos-publishing/FacebookPublishing.vala:1181
 msgid "Friends"
 msgstr ""
 
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/pantheon-photos-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr ""
 
-#: plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/pantheon-photos-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr ""
 
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/pantheon-photos-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr ""
 
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/pantheon-photos-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr ""
 
-#: plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/pantheon-photos-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr ""
 
-#: plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/pantheon-photos-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr ""
 
-#: plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/pantheon-photos-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr ""
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+#: plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala:28
 msgid "Core Slideshow Transitions"
 msgstr ""
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:75
+#: plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala:75
 msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
 msgstr ""
 
-#: plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/pantheon-photos-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr ""
 
-#: plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/pantheon-photos-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr ""
 
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/pantheon-photos-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr ""
 
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:56
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:56
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
-"Please select a library to import, either by selecting one of the existing libraries found by Shotwell or by selecting an alternative F-Spot database file."
+"Please select a library to import, either by selecting one of the existing libraries found by Pantheon Photos or by selecting an alternative F-Spot database file."
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
 "Please select an F-Spot database file."
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:60
 msgid "Manually select an F-Spot database file to import:"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:62
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is"
 " not an F-Spot database"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
+"database is not supported by Pantheon Photos"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags "
 "table"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:70
 #, c-format
 msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n"
+"Pantheon Photos has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n"
 "\n"
-"You can close this dialog and start using Shotwell while the import is taking place in the background."
+"You can close this dialog and start using Pantheon Photos while the import is taking place in the background."
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:84
 #, c-format
 msgid "F-Spot library: %s"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: plugins/pantheon-photos-data-imports/FSpotImporter.vala:416
 msgid "Preparing to import"
 msgstr ""
 
@@ -3933,222 +3933,222 @@
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 
-#: ui/shotwell.glade:7
+#: ui/pantheon-photos.glade:7
 msgid "Search"
 msgstr ""
 
-#: ui/shotwell.glade:47
+#: ui/pantheon-photos.glade:47
 msgid "_Name of search:"
 msgstr ""
 
-#: ui/shotwell.glade:108
+#: ui/pantheon-photos.glade:108
 msgid "_Match"
 msgstr ""
 
-#: ui/shotwell.glade:137
+#: ui/pantheon-photos.glade:137
 msgid "of the following:"
 msgstr ""
 
-#: ui/shotwell.glade:218
+#: ui/pantheon-photos.glade:218
 msgid "<b>Printed Image Size</b>"
 msgstr ""
 
-#: ui/shotwell.glade:235
+#: ui/pantheon-photos.glade:235
 msgid "Use a _standard size:"
 msgstr ""
 
-#: ui/shotwell.glade:278
+#: ui/pantheon-photos.glade:278
 msgid "Use a c_ustom size:"
 msgstr ""
 
-#: ui/shotwell.glade:368
+#: ui/pantheon-photos.glade:368
 msgid "_Match photo aspect ratio"
 msgstr ""
 
-#: ui/shotwell.glade:392
+#: ui/pantheon-photos.glade:392
 msgid "_Autosize:"
 msgstr ""
 
-#: ui/shotwell.glade:432
+#: ui/pantheon-photos.glade:432
 msgid "<b>Titles</b>"
 msgstr ""
 
-#: ui/shotwell.glade:449
+#: ui/pantheon-photos.glade:449
 msgid "Print image _title"
 msgstr ""
 
-#: ui/shotwell.glade:493
+#: ui/pantheon-photos.glade:493
 msgid "<b>Pixel Resolution</b>"
 msgstr ""
 
-#: ui/shotwell.glade:513
+#: ui/pantheon-photos.glade:513
 msgid "_Output photo at:"
 msgstr ""
 
-#: ui/shotwell.glade:548
+#: ui/pantheon-photos.glade:548
 msgid "pixels per inch"
 msgstr ""
 
-#: ui/shotwell.glade:581 ui/shotwell.glade:623
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:27
+#: ui/pantheon-photos.glade:581 ui/pantheon-photos.glade:623
+#: plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade:27
 msgid "label"
 msgstr ""
 
-#: ui/shotwell.glade:719
-msgid "Shotwell Preferences"
+#: ui/pantheon-photos.glade:719
+msgid "Pantheon Photos Preferences"
 msgstr ""
 
-#: ui/shotwell.glade:796
+#: ui/pantheon-photos.glade:796
 msgid "white"
 msgstr ""
 
-#: ui/shotwell.glade:823
+#: ui/pantheon-photos.glade:823
 msgid "black"
 msgstr ""
 
-#: ui/shotwell.glade:871
+#: ui/pantheon-photos.glade:871
 msgid "_Watch library directory for new files"
 msgstr ""
 
-#: ui/shotwell.glade:900
+#: ui/pantheon-photos.glade:900
 msgid "Metadata"
 msgstr ""
 
-#: ui/shotwell.glade:920
+#: ui/pantheon-photos.glade:920
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 
-#: ui/shotwell.glade:946
+#: ui/pantheon-photos.glade:946
 msgid "Display"
 msgstr ""
 
-#: ui/shotwell.glade:967
+#: ui/pantheon-photos.glade:967
 msgid "_Import photos to:"
 msgstr ""
 
-#: ui/shotwell.glade:990
+#: ui/pantheon-photos.glade:990
 msgid "_Background:"
 msgstr ""
 
-#: ui/shotwell.glade:1013
+#: ui/pantheon-photos.glade:1013
 msgid "Importing"
 msgstr ""
 
-#: ui/shotwell.glade:1036
+#: ui/pantheon-photos.glade:1036
 msgid "_Directory structure:"
 msgstr ""
 
-#: ui/shotwell.glade:1075
+#: ui/pantheon-photos.glade:1075
 msgid "_Pattern:"
 msgstr ""
 
-#: ui/shotwell.glade:1157
+#: ui/pantheon-photos.glade:1157
 msgid "Example:"
 msgstr ""
 
-#: ui/shotwell.glade:1174
+#: ui/pantheon-photos.glade:1174
 msgid "R_ename imported files to lowercase"
 msgstr ""
 
-#: ui/shotwell.glade:1203
+#: ui/pantheon-photos.glade:1203
 msgid "RAW Developer"
 msgstr ""
 
-#: ui/shotwell.glade:1238
+#: ui/pantheon-photos.glade:1238
 msgid "De_fault:"
 msgstr ""
 
-#: ui/shotwell.glade:1292
+#: ui/pantheon-photos.glade:1292
 msgid "E_xternal photo editor:"
 msgstr ""
 
-#: ui/shotwell.glade:1308
+#: ui/pantheon-photos.glade:1308
 msgid "External _RAW editor:"
 msgstr ""
 
-#: ui/shotwell.glade:1373
+#: ui/pantheon-photos.glade:1373
 msgid "External Editors"
 msgstr ""
 
-#: ui/shotwell.glade:1400
+#: ui/pantheon-photos.glade:1400
 msgid "Plugins"
 msgstr ""
 
-#: ui/shotwell.glade:1469
+#: ui/pantheon-photos.glade:1469
 msgid "_Delay:"
 msgstr ""
 
-#: ui/shotwell.glade:1485
+#: ui/pantheon-photos.glade:1485
 msgid "_Transition effect:"
 msgstr ""
 
-#: ui/shotwell.glade:1501
+#: ui/pantheon-photos.glade:1501
 msgid "Transition d_elay:"
 msgstr ""
 
-#: ui/shotwell.glade:1513
+#: ui/pantheon-photos.glade:1513
 msgid "Show t_itle"
 msgstr ""
 
-#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
+#: ui/pantheon-photos.glade:1603 ui/pantheon-photos.glade:1616
 msgid "seconds"
 msgstr "sekondes"
 
-#: ui/shotwell.glade:1696
+#: ui/pantheon-photos.glade:1696
 msgid "_Login"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:21
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:21
 msgid ""
 " (text depends on fb username and is modified in the app - \n"
 "anything put into this field won't display)"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:39
 msgid "Publish to an e_xisting album:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:57
 msgid "Create a _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:139
 msgid "Videos and new photo albums _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:226
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:175
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:102
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:178
+#: plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade:226
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:197
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:137
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:229
+#: plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade:99
 msgid "_Logout"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
+#: plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade:212
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:153
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:243
+#: plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade:115
 msgid "_Publish"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
+#: plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade:16
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
+#: plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade:37
 msgid "Authorization _Number:"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:19
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:19
 msgid ""
 "You are logged into Flickr as (name).\n"
 "\n"
@@ -4156,95 +4156,95 @@
 "so changes made here will not display)"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:44
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:44
 msgid "_visibility label (populated in the code)"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
+#: plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade:61
 msgid "Photo _size:"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:18
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:18
 msgid ""
 "'you are logged in as $name'\n"
 "(populated in the application code)"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:75
 msgid "An _existing album:"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:94
+#: plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade:52
 msgid "A _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:113
 msgid "L_ist album in public gallery"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:134
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:134
 msgid ""
 "$mediatype will appear in\n"
 "(populated in code)"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
+#: plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade:150
 msgid "Photo _size preset:"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.glade:49
+#: plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade:49