Merge lp:~amigadave/simple-scan/fix-desktop-keywords into lp:~simple-scan-team/simple-scan/trunk

[David King]

[Robert Ancell (robert-ancell)]

Thanks David!

review: Approve

=== modified file 'po/fr.po'
--- po/fr.po	2015-02-23 05:16:45 +0000
+++ po/fr.po	2015-03-02 07:51:42 +0000
@@ -302,7 +302,7 @@
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr "scanner;numériseur;à plat;adf"
+msgstr "scanner;numériseur;à plat;adf;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"

=== modified file 'po/sv.po'
--- po/sv.po	2015-02-23 05:16:45 +0000
+++ po/sv.po	2015-03-02 07:51:42 +0000
@@ -301,7 +301,7 @@
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbädd;adf;skan;skanner"
+msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"