[pitivi: 22/65] String fixes

[Thibault Saunier <tsaunier src gnome org>]

commit d81ab8bc6d58f0fa9950a3074ce614037616148e
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Fri Jun 24 22:37:03 2011 -0400

    String fixes
    
    Fixes: 651483

 pitivi/check.py         |   44 ++++++++++++++++++++++----------------------
 pitivi/discoverer.py    |    4 ++--
 pitivi/ui/common.py     |    5 +++--
 pitivi/ui/sourcelist.py |    4 ++--
 pitivi/utils.py         |    2 +-
 5 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/pitivi/check.py b/pitivi/check.py
index 1738140..84a980f 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -106,56 +106,56 @@ def check_required_version(modulename):
 def initial_checks():
     reg = gst.registry_get_default()
     if PiTiVi:
-        return (_("%s is already running!") % APPNAME,
+        return (_("%s is already running") % APPNAME,
                 _("An instance of %s is already running in this script.") % APPNAME)
     if not reg.find_plugin("gnonlin"):
-        return (_("Could not find the GNonLin plugins!"),
+        return (_("Could not find the GNonLin plugins"),
                 _("Make sure the plugins were installed and are available in the GStreamer plugins path."))
     if not reg.find_plugin("autodetect"):
-        return (_("Could not find the autodetect plugins!"),
-                _("Make sure you have installed gst-plugins-good and is available in the GStreamer plugin path."))
+        return (_("Could not find the autodetect plugins"),
+                _("Make sure you have installed gst-plugins-good and that it's available in the GStreamer plugin path."))
     if not hasattr(gtk.gdk.Window, 'cairo_create'):
-        return (_("PyGTK doesn't have cairo support!"),
+        return (_("PyGTK doesn't have cairo support"),
                 _("Please use a version of the GTK+ Python bindings built with cairo support."))
     if not initiate_videosinks():
         return (_("Could not initiate the video output plugins"),
-                _("Make sure you have at least one valid video output sink available (xvimagesink or ximagesink)"))
+                _("Make sure you have at least one valid video output sink available (xvimagesink or ximagesink)."))
     if not initiate_audiosinks():
         return (_("Could not initiate the audio output plugins"),
-                _("Make sure you have at least one valid audio output sink available (alsasink or osssink)"))
+                _("Make sure you have at least one valid audio output sink available (alsasink or osssink)."))
     if not __try_import__("cairo"):
         return (_("Could not import the cairo Python bindings"),
-                _("Make sure you have the cairo Python bindings installed"))
+                _("Make sure you have the cairo Python bindings installed."))
     if not __try_import__("goocanvas"):
         return (_("Could not import the goocanvas Python bindings"),
-                _("Make sure you have the goocanvas Python bindings installed"))
+                _("Make sure you have the goocanvas Python bindings installed."))
     if not __try_import__("xdg"):
         return (_("Could not import the xdg Python library"),
-                _("Make sure you have the xdg Python library installed"))
+                _("Make sure you have the xdg Python library installed."))
     req, inst = check_required_version("gtk")
     if req:
-        return (_("You do not have a recent enough version of the GTK+ Python bindings (currently %s)") % inst,
-                _("Install a version of the GTK+ Python bindings greater or equal to %s") % req)
+        return (_("You do not have a recent enough version of the GTK+ Python bindings (your version %s)") % inst,
+                _("Install a version of the GTK+ Python bindings greater than or equal to %s.") % req)
     req, inst = check_required_version("pygst")
     if req:
-        return (_("You do not have a recent enough version of the GStreamer Python bindings (currently %s)") % inst,
-                _("Install a version of the GStreamer Python bindings greater or equal to %s") % req)
+        return (_("You do not have a recent enough version of GStreamer Python bindings (your version %s)") % inst,
+                _("Install a version of the GStreamer Python bindings greater than or equal to %s.") % req)
     req, inst = check_required_version("gst")
     if req:
-        return (_("You do not have a recent enough version of GStreamer (currently %s)") % inst,
-                _("Install a version of the GStreamer greater or equal to %s") % req)
+        return (_("You do not have a recent enough version of GStreamer (your version %s)") % inst,
+                _("Install a version of the GStreamer greater than or equal to %s.") % req)
     req, inst = check_required_version("cairo")
     if req:
-        return (_("You do not have a recent enough version of the cairo Python bindings (currently %s)") % inst,
-                _("Install a version of the cairo Python bindings greater or equal to %s") % req)
+        return (_("You do not have a recent enough version of the cairo Python bindings (your version %s)") % inst,
+                _("Install a version of the cairo Python bindings greater than or equal to %s.") % req)
     req, inst = check_required_version("gnonlin")
     if req:
-        return (_("You do not have a recent enough version of the GNonLin GStreamer plugin (currently %s)") % inst,
-                _("Install a version of the GNonLin GStreamer plugin greater or equal to %s") % req)
+        return (_("You do not have a recent enough version of the GNonLin GStreamer plugin (your version %s)") % inst,
+                _("Install a version of the GNonLin GStreamer plugin greater than or equal to %s.") % req)
     if not __try_import__("zope.interface"):
         return (_("Could not import the Zope interface module"),
-                _("Make sure you have the zope.interface module installed"))
+                _("Make sure you have the zope.interface module installed."))
     if not __try_import__("pkg_resources"):
         return (_("Could not import the distutils modules"),
-                _("Make sure you have the distutils python module installed"))
+                _("Make sure you have the distutils Python module installed."))
     return None
diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index 70f7ca9..17445d7 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -243,7 +243,7 @@ class Discoverer(Signallable, Loggable):
 
         if not self.current_streams and not missing_plugins:
             # woot, nothing decodable
-            self.error = _('Can not decode file.')
+            self.error = _('Cannot decode file.')
             self.error_detail = _("The given file does not contain audio, "
                     "video or picture streams.")
             self._emitError()
@@ -361,7 +361,7 @@ class Discoverer(Signallable, Loggable):
         if not source:
             self.warning("This is not a media file: %s", self.current_uri)
             self.error = _("No available source handler.")
-            self.error_detail = _("You do not have a GStreamer source element to handle protocol '%s'") % gst.uri_get_protocol(self.current_uri)
+            self.error_detail = _('You do not have a GStreamer source element to handle the "%s" protocol') % gst.uri_get_protocol(self.current_uri)
 
             return None
 
diff --git a/pitivi/ui/common.py b/pitivi/ui/common.py
index 2bf0803..0f8a49c 100644
--- a/pitivi/ui/common.py
+++ b/pitivi/ui/common.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pitivi.settings import GlobalSettings
 import cairo
 from pitivi.stream import VideoStream, AudioStream, TextStream, \
@@ -122,11 +123,11 @@ def beautify_stream(stream):
     elif type(stream) == VideoStream:
         if stream.raw:
             if stream.framerate.num:
-                templ = _("<b>Video:</b> %d x %d <i>pixels</i> at %.2f<i>fps</i>")
+                templ = _(u"<b>Video:</b> %dÃ%d <i>pixels</i> at %.2f<i>fps</i>")
                 templ = templ % (stream.par * stream.width, stream.height,
                         float(stream.framerate))
             else:
-                templ = _("<b>Image:</b> %d x %d <i>pixels</i>")
+                templ = _(u"<b>Image:</b> %dÃ%d <i>pixels</i>")
                 templ = templ % (stream.par * stream.width, stream.height)
             return templ
         return _("<b>Unknown Video format:</b> %s") % stream.videotype
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index 600dfdc..db0efba 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -653,10 +653,10 @@ class SourceList(gtk.VBox, Loggable):
         self._progressbar.hide()
         if self._errors:
             if len(self._errors) > 1:
-                self._warning_label.set_text(_("Errors occured while importing."))
+                self._warning_label.set_text(_("Errors occurred while importing."))
                 self._view_error_btn.set_label(_("View errors"))
             else:
-                self._warning_label.set_text(_("An error occured while importing."))
+                self._warning_label.set_text(_("An error occurred while importing."))
                 self._view_error_btn.set_label(_("View error"))
 
             self._import_warning_infobar.show_all()
diff --git a/pitivi/utils.py b/pitivi/utils.py
index 21a4bd4..7760528 100644
--- a/pitivi/utils.py
+++ b/pitivi/utils.py
@@ -281,7 +281,7 @@ def uri_is_reachable(uri):
         raise NotImplementedError(
             # Translators: "non local" means the project is not stored
             # on a local filesystem
-            _("%s doesn't yet handle non local projects") % APPNAME)
+            _("%s doesn't yet handle non-local projects") % APPNAME)
     return os.path.isfile(gst.uri_get_location(uri))