New upstream version 0.30.4upstream/0.30.4

2 files changed, 9 insertions, 9 deletions

diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index bc03007..d21de4e 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -412,7 +412,7 @@
     <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
     <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
     <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
-    <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
+    <child name="org-gnome-shotwell-publishing-google-photos" schema="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" />
     <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
 </schema>
 
@@ -486,17 +486,17 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/">
+<schema id="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" path="/org/yorba/shotwell/sharing/org-gnome-shotwell-publishing-google-photos/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
-        <description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any.</description>
+        <description>The OAuth token used to refresh the Google Photos session for the currently logged in user, if any.</description>
     </key>
     
     <key name="default-size" type="i">
         <default>2</default>
         <summary>default size</summary>
-        <description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description>
+        <description>A numeric code representing the default size for photos uploaded to Google Photos Albums</description>
     </key>
     
     <key name="last-album" type="s">
@@ -508,7 +508,7 @@
     <key name="strip-metadata" type="b">
         <default>false</default>
         <summary>remove sensitive info from uploads</summary>
-        <description>Whether images being uploaded to Picasa should have their metadata removed first</description>
+        <description>Whether images being uploaded to Google Photos should have their metadata removed first</description>
     </key>
 </schema>
 
@@ -721,10 +721,10 @@
         <description>True if the Flickr publishing plugin is enabled, false otherwise</description>
     </key>
 
-    <key name="publishing-picasa" type="b">
+    <key name="org-gnome-shotwell-publishing-google-photos" type="b">
         <default>true</default>
-        <summary>enable picasa publishing plugin</summary>
-        <description>True if the Picasa Web Albums publishing plugin is enabled, false otherwise</description>
+        <summary>enable Google Photos publishing plugin</summary>
+        <description>True if the Google Photos publishing plugin is enabled, false otherwise</description>
     </key>
 
     <key name="publishing-youtube" type="b">
diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in
index 4e7b38c..c29fa8f 100644
--- a/misc/shotwell.appdata.xml.in
+++ b/misc/shotwell.appdata.xml.in
@@ -17,7 +17,7 @@
     </p>
     <p>
       When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr,
-      Picasa (Google Plus), and more.
+      Google Photos, and more.
     </p>
     <p>
       Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.