Merge branch 'release/debian/0.30.10-1'debian/0.30.10-1

3 files changed, 53 insertions, 1 deletions

diff --git a/help/C/other-plugins.page b/help/C/other-plugins.page
index 4381892..21ae32b 100644
--- a/help/C/other-plugins.page
+++ b/help/C/other-plugins.page
@@ -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="https://wiki.gnome.org/Apps/Shotwell/Architecture/WritingPlugins">https://wiki.gnome.org/Apps/Shotwell/Architecture/WritingPlugins</link></p></note>
     
 </page>
 
diff --git a/help/C/privacy-policy.page b/help/C/privacy-policy.page
new file mode 100644
index 0000000..25fc06c
--- /dev/null
+++ b/help/C/privacy-policy.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="privacy-policy">
+  <info>
+    <link type="guide" xref="share-upload" />
+  </info>
+  <title>Shotwell's privacy policy for Online Services</title>
+  <section id="google"><title>Google</title>
+    <section id="google-information-storage">
+      <title>Information Shotwell Stores and Transmits About You</title>
+      <p>The Shotwell Connect application and its data store reside locally on your personal computer.</p>
+      <p>During the course of its operation, Shotwell Connect may store an authentication token that it receives from YouTube and Google Photos on your computer. This authentication token is simply a session-identifying sequence of letters and numbers. It contains no password, user name, or other personal information.</p>
+      <p>At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Convervancy or any of the developers of the Shotwell Connect Application for Google services.
+      </p>
+      <p>For Google's own privacy policy, please refer to <link href="https://policies.google.com/privacy">https://policies.google.com/privacy</link></p>
+    </section>
+    <section id="google-youtube">
+    <title>YouTube</title>
+    <p>Shotwell uses the YouTube API services <link href="https://developers.google.com/youtube">https://developers.google.com/youtube</link> for accessing your YouTube channel and upload the videos.</p>
+    <section id="google-youtube-terms">
+      <title>YouTube terms and permissions</title>
+      <p>By using Shotwell to access YouTube, you agree to be bound to the YouTube Terms of Service as available at <link href="https://www.youtube.com/t/terms">https://www.youtube.com/t/terms</link></p>
+    </section>
+    <section id="google-youtube-permissions">
+      <title>Permissions you grant Shotwell for YouTube</title>
+      <p>By using Shotwell, you grant the Shotwell Connect application permission to publish videos to your YouTube channel. Other than uploading videos, Shotwell does not insert, modify or remove any information from your YouTube account and channel.
+      </p>
+    </section>
+    </section>
+    <section id="google-photos">
+      <title>Google Photos</title>
+      <p>Shotwell uses the Google Photos API services <link href="https://developers.google.com/photos/">https://developers.google.com/photos/</link> for all interaction with your Google Photos data</p>
+      <section id="google-photos-permissions">
+        <title>Permissions you Grant Shotwell for Google Photos</title>
+        <p>By using Shotwell, you grant the Shotwell Connect application to publish photos on your Google Photos account. It will download the list of available albums to allow you to chose an existing album to upload to, it can create albums on your behalf. Other than creating albums and uploading photos, Shotwell does no modification whatsoever to the existing data on Google Photos
+        </p>
+      </section>
+    </section>
+  </section>
+  <section id="flickr"><title>Flickr</title>
+  <section id="flickr-information-storage">
+      <title>Information Shotwell Stores and Transmits About You</title>
+      <p>The Shotwell Connect application and its data store reside locally on your personal computer. During the course of its operation, Shotwell Connect may store an authentication token that it receives from Flickr on your computer. This authentication token is simply a session-identifying sequence of letters and numbers. It contains no password, user name, or other personal information. At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Convervancy or any of the developers of the Shotwell Connect Application for Flickr.
+      </p>
+    </section>
+    <section id="flickr-permissions">
+    <title>Permissions you grant Shotwell for Flickr</title>
+    <p>By using Shotwell, you grant the Shotwell Connect application acces to publish photos to your Flickr account. It will download the list of available albums to allow you to chose an existing album to upload to. It can also create new albums on your behalf. Other than creating albums and uploading photos, Shotwell does not modification whatsoever to the existing data on your Flickr account.</p>
+    </section>
+  </section>
+</page>
diff --git a/help/meson.build b/help/meson.build
index b5c15b4..1ae5d02 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -27,6 +27,7 @@ yelp_pages = [
     'other-missing.page',
     'other-multiple.page',
     'other-plugins.page',
+    'privacy-policy.page',
     'raw.page',
     'running.page',
     'share-background.page',