Merge lp:~elementary-apps/pantheon-photos/update-appdata into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

update appdata.xml

=== modified file 'misc/shotwell.appdata.xml'
--- misc/shotwell.appdata.xml	2013-10-02 00:04:14 +0000
+++ misc/shotwell.appdata.xml	2015-11-26 19:29:31 +0000
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Yorba Foundation ([e-mail]) -->
+<!-- Copyright 2013 Yorba Foundation ([e-mail])
+     Copyright 2015 elementary, LLC <[e-mail]> -->
 <application>
   <id type="desktop">shotwell.desktop</id>
   <licence>CC0</licence>
+  <project_group>elementary</project_group>
+  <name>Photos</name>
+  <icon type="stock">multimedia-photo-manager</icon>
   <summary>Popular photo manager</summary>
   <description>
     <p>
-      Shotwell 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
-      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,
-      Picasa (Google Plus), and more.
-    </p>
-    <p>
-      Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.
+      Photos is an easy-to-use, fast photo organizer. It allows you to import
+      photos from your camera or disk, organize them by date and subject matter,
+      even ratings. It also offers basic photo editing, like crop, red-eye correction,
+      color adjustments, and straighten. Photos' non-destructive photo editor does
+      not alter your master photos, making it easy to experiment and correct errors.
+    </p>
+    <p>
+      Photos supports JPEG, PNG, TIFF, and a variety of RAW file formats.
     </p>
   </description>
-  <url type="homepage">http://www.yorba.org/projects/shotwell/</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>
-    <screenshot>http://www.yorba.org/wp-content/uploads/2013/02/organize-300x197.png</screenshot>
-    <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>
-  <project_group>GNOME</project_group>
+  <url type="homepage">https://elementary.io/</url>
+  <updatecontact>contact_at_elementary.io</updatecontact>
 </application>