Translations and typo

5 files changed, 17 insertions, 16 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index da862c7..a57c6d0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README FORMAT LICENSE mat-cli mat-gui
+include README FORMATS LICENSE mat-cli mat-gui
 recursive-include mat *.py
 recursive-include test *.py clean.* dirty.*
diff --git a/locale/fr/LC_MESSAGES/gui.pot b/locale/fr/LC_MESSAGES/gui.po
index 50daecd..f98372f 100644
--- a/locale/fr/LC_MESSAGES/gui.pot
+++ b/locale/fr/LC_MESSAGES/gui.po
@@ -150,7 +150,7 @@ msgid "Add unsupported file to archives"
 msgstr "Ajout des formats non supportés"
 
 #: gui.py:359
-msgid "Add non-supported (and so non-anonymised) file to outputed archive"
+msgid "Add non-supported (and so non-anonymised) file to output archive"
 msgstr "Ajouter les fichiers de formats non-supportés (et donc, non traités) aux archives anonymisées"
 
 #: gui.py:395 gui.py:409 gui.py:412 gui.py:422 gui.py:425
diff --git a/mat-cli b/mat-cli
index 804c4cf..c0f2d72 100755
--- a/mat-cli
+++ b/mat-cli
@@ -20,11 +20,11 @@ def parse():
     '''
     parser = optparse.OptionParser(usage='%prog [options] files')
     parser.add_option('--add2archive', '-a', action='store_true',
-        default=False, help='Add to outputed archive non-supported filetypes')
+        default=False, help='Add to output archive non-supported filetypes')
     parser.add_option('--backup', '-b', action='store_true', default=False,
         help='Keep a backup copy')
     parser.add_option('--check', '-c',  action='store_true', default=False,
-        help='Check if a file is free of harmfull metadatas')
+        help='Check if a file is free of harmful metadatas')
     parser.add_option('--display', '-d', action='store_true', default=False,
         help='List all the meta of a file without removing them')
     parser.add_option('--force', '-f', action='store_true', default=False,
@@ -32,7 +32,7 @@ def parse():
     parser.add_option('--list', '-l', action='store_true', default=False,
         help='List all supported fileformat')
     parser.add_option('--ugly', '-u', action='store_true', default=False,
-        help='Remove harmful meta, but loss can occure')
+        help='Remove harmful meta, but loss can occur')
     parser.add_option('--version', '-v', action='callback',
         callback=display_version, help='Display version and exit')
 
diff --git a/mat-gui b/mat-gui
index 092353d..d85ddc9 100755
--- a/mat-gui
+++ b/mat-gui
@@ -54,6 +54,9 @@ class GUI:
         self.window.connect('destroy', gtk.main_quit)
         self.window.set_default_size(800, 600)
 
+        self.accelerator = gtk.AccelGroup()
+        self.window.add_accel_group(self.accelerator)
+
         vbox = gtk.VBox()
         self.window.add(vbox)
 
@@ -391,7 +394,7 @@ non-anonymised) file to output archive'))
             Check if selected elements are clean
         '''
         for line in iterator:  # for each file in selection
-            self.statusbar.push(0, 'Checking %s...' % self.liststore[line][1])
+            self.statusbar.push(0, _('Checking %s...') % self.liststore[line][1])
             if self.liststore[line][0].file.is_clean():
                 string = _('clean')
             else:
@@ -399,7 +402,7 @@ non-anonymised) file to output archive'))
             logging.info('%s is %s' % (self.liststore[line][1], string))
             self.liststore[line][3] = string
             yield True
-        self.statusbar.push(0, 'Ready')
+        self.statusbar.push(0, _('Ready'))
         yield False
 
     def mat_clean(self, iterator):
@@ -408,13 +411,13 @@ non-anonymised) file to output archive'))
         '''
         for line in iterator:  # for each file in selection
             logging.info('Cleaning %s' % self.liststore[line][1])
-            self.statusbar.push(0, 'Cleaning %s...' % self.liststore[line][1])
+            self.statusbar.push(0, _('Cleaning %s...') % self.liststore[line][1])
             if self.liststore[line][3] is not _('clean'):
                 if self.force or not self.liststore[line][0].file.is_clean():
                     self.liststore[line][0].file.remove_all()
             self.liststore[line][3] = _('clean')
             yield True
-        self.statusbat.push(0, 'Ready')
+        self.statusbat.push(0, _('Ready'))
         yield False
 
     def mat_clean_dirty(self, iterator):
@@ -422,14 +425,14 @@ non-anonymised) file to output archive'))
             Clean selected elements (ugly way)
         '''
         for line in iterator:  # for each file in selection
-            logging.info('Cleaning (lossy way) %s' % self.liststore[line][1])
-            self.statusbar.push(0, 'Cleaning %s...' % self.liststore[line][1])
+            logging.info(_('Cleaning (lossy way) %s') % self.liststore[line][1])
+            self.statusbar.push(0, _('Cleaning %s...') % self.liststore[line][1])
             if self.liststore[line][3] is not _('clean'):
                 if self.force or not self.liststore[line][0].file.is_clean():
                     self.liststore[line][0].file.remove_all_ugly()
             self.liststore[line][3] = _('clean')
             yield True
-        self.statusbar.push(0, 'Ready')
+        self.statusbar.push(0, _('Ready'))
         yield False
 
 
diff --git a/mat.desktop b/mat.desktop
index d405199..4515c3f 100644
--- a/mat.desktop
+++ b/mat.desktop
@@ -4,8 +4,6 @@ Name=Metadata Anonymisation Toolkit
 GenericName=Metadata Anonymisation Toolkit
 Version=1.0
 Type=Application
-Comment=Metadata Anonymisation Toolkit
-Comment[Fr]=Kit d'anonymisation de metadata
-TryExec=mat-gui
+Exec=mat-gui
 Terminal=false
-Categories=Applications;Utility;Security
+Categories=Application;Utility;Security