5 files changed, 68 insertions, 51 deletions
diff --git a/data/kde/rapid-photo-downloader.desktop b/data/kde/rapid-photo-downloader.desktop.in
index cd89692..c02ec67 100644
--- a/data/kde/rapid-photo-downloader.desktop
+++ b/data/kde/rapid-photo-downloader.desktop.in
@@ -5,8 +5,7 @@ Actions=exec;
 
 [Desktop Action exec]
 # %f gives StorageAccess.filePath, %d gives Block.device, %i gives UDI
-Exec=/usr/bin/rapid-photo-downloader
-Icon=/usr/share/pixmaps/rapid-photo-downloader.png
-Name=Download Photos with Rapid Photo Downloader
-Name[fr]=Téléchargement de photos avec Rapid Photo Downloader
+Exec=rapid-photo-downloader
+Icon=rapid-photo-downloader
+_Name=Download Photos and Videos with Rapid Photo Downloader
 
diff --git a/data/rapid-photo-downloader.appdata.xml b/data/rapid-photo-downloader.appdata.xml
deleted file mode 100644
index e6f9c0e..0000000
--- a/data/rapid-photo-downloader.appdata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Damon Lynch <damonlynch@gmail.com> -->
-<application>
-  <id type="desktop">rapid-photo-downloader.desktop</id>
-  <metadata_license>CC-BY</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <description>
-    <p>
-      Rapid Photo Downloader imports photos and videos from memory cards and 
-      other devices at high speed. It can be configured to rename photos and 
-      videos with meaningful filenames. It can back up photos and videos as 
-      they are downloaded. It can download from and back up to multiple devices 
-      simultaneously, which is valuable when importing from multiple memory
-      cards or backing up to multiple external drives. 
-    </p>
-    <p>
-      Written by a photographer for professional and amateur photographers, 
-      Rapid Photo Downloader is easy to configure and use. Program preferences
-      are configured without the need for complicated codes. Common tasks can be
-      automated, such as unmounting a memory card when the download is complete.
-    </p>
-    <p>
-      Downloading directly from a camera works only with some cameras. It works
-      well with some cameras, and not at all with others. For best performance,
-      using a memory card reader is recommended. 
-    </p>
-  </description>
-  <url type="homepage">http://www.damonlynch.net/rapid/</url>
-  <screenshots>
-    <screenshot type="default">http://www.damonlynch.net/rapid/appdata/2014/01/mainwindow.png</screenshot>
-    <screenshot>http://www.damonlynch.net/rapid/appdata/2014/01/subfolder-preferences.png</screenshot>
-    <screenshot>http://www.damonlynch.net/rapid/appdata/2014/01/rename-preferences.png</screenshot>    
-    <screenshot>http://www.damonlynch.net/rapid/appdata/2014/01/backup-preferences.png</screenshot>    
-  </screenshots>
-  <updatecontact>damonlynch@gmail.com</updatecontact>
-</application>
diff --git a/data/rapid-photo-downloader.appdata.xml.in b/data/rapid-photo-downloader.appdata.xml.in
new file mode 100644
index 0000000..a03b428
--- /dev/null
+++ b/data/rapid-photo-downloader.appdata.xml.in
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014-2016 Damon Lynch <damonlynch@gmail.com> -->
+<application>
+  <id type="desktop">rapid-photo-downloader.desktop</id>
+  <metadata_license>CC-BY</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <description>
+    <_p>
+      Rapid Photo Downloader imports photos and videos from cameras, phones,
+      memory cards and other devices at high speed. It can be configured to
+      rename photos and videos with meaningful filenames you specify. It can also
+      back up photos and videos as they are downloaded. It downloads from and backs
+      up to multiple devices simultaneously.
+    </_p>
+    <_p>
+      Unique to Rapid Photo Downloader is its Timeline, which groups photos and
+      videos based on how much time elapsed between consecutive shots. Use it to
+      identify photos and videos taken at different periods in a single day or
+      over consecutive days.
+    </_p>
+    <_p>
+      Written by a photographer for professional and amateur photographers, 
+      Rapid Photo Downloader is easy to configure and use. Program preferences
+      are configured without the need for complicated codes. Common tasks can be
+      automated, such as unmounting a memory card when the download is complete.
+    </_p>
+  </description>
+  <url type="homepage">http://www.damonlynch.net/rapid/</url>
+  <url type="translate">http://www.damonlynch.net/rapid/translate.html</url>
+  <url type="donation">http://www.damonlynch.net/rapid/</url>
+  <keywords>
+    <keyword>RAW</keyword>
+    <keyword>ingest</keyword>
+    <keyword>memory</keyword>
+    <keyword>card</keyword>
+    <keyword>filter</keyword>
+    <keyword>sort</keyword>
+    <keyword>select</keyword>
+    <keyword>choose</keyword>
+    <keyword>automate</keyword>
+    <keyword>workflow</keyword>
+    <keyword></keyword>
+  </keywords>
+  <screenshots>
+    <screenshot type="default">http://www.damonlynch.net/rapid/appdata/2016/05/mainwindow.png</screenshot>
+    <screenshot>http://www.damonlynch.net/rapid/appdata/2016/05/downloading.png</screenshot>
+    <screenshot>http://www.damonlynch.net/rapid/appdata/2016/05/timeline.png</screenshot>    
+    <screenshot>http://www.damonlynch.net/rapid/appdata/2016/05/rightclick.png</screenshot>
+  </screenshots>
+  <updatecontact>damonlynch@gmail.com</updatecontact>
+</application>
diff --git a/data/rapid-photo-downloader.desktop b/data/rapid-photo-downloader.desktop
deleted file mode 100644
index 470eca2..0000000
--- a/data/rapid-photo-downloader.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Rapid Photo Downloader
-GenericName=Rapid Photo Downloader
-Comment=Download photos and videos from cameras, memory cards and Portable Storage Devices
-Exec=rapid-photo-downloader
-Icon=rapid-photo-downloader
-MimeType=x-content/image-dcf;
-Terminal=false
-Type=Application
-Categories=Graphics;Photography;
diff --git a/data/rapid-photo-downloader.desktop.in b/data/rapid-photo-downloader.desktop.in
new file mode 100644
index 0000000..003050b
--- /dev/null
+++ b/data/rapid-photo-downloader.desktop.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Categories=Graphics;Photography;
+_Comment=Download, rename and back up photos and videos from cameras and other devices
+Exec=rapid-photo-downloader
+_GenericName=Photo Downloader
+Icon=rapid-photo-downloader
+MimeType=x-content/image-dcf;
+_Name=Rapid Photo Downloader
+Name[en_US]=Rapid Photo Downloader
+Terminal=false
+Type=Application
+Version=1.0
+# TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+_Keywords=photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory;card;