[pitivi: 19/65] Fix header capitalization in menus and clarify clips vs files

[Thibault Saunier <tsaunier src gnome org>]

commit 805e3342abdaabdba9822e941fc9e1c05e113bc3
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Tue Jun 21 16:26:57 2011 -0400

    Fix header capitalization in menus and clarify clips vs files
    
    Fixes bug #587235

 pitivi/ui/mainwindow.py |    6 +++---
 pitivi/ui/sourcelist.py |   24 +++++++++++++-----------
 pitivi/ui/timeline.py   |    8 ++++----
 3 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 47fa12c..affc194 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -266,8 +266,8 @@ class PitiviMainWindow(gtk.Window, Loggable):
              None, _("Reload the current project"), self._revertToSavedProjectCb),
             ("ProjectSettings", gtk.STOCK_PROPERTIES, _("Project Settings"),
              None, _("Edit the project settings"), self._projectSettingsCb),
-            ("RenderProject", 'pitivi-render', _("_Render project"),
-             None, _("Render project..."), self._recordCb),
+            ("RenderProject", 'pitivi-render' , _("_Render Project..."),
+             None, _("Export your project as a finished movie"), self._recordCb),
             ("Undo", gtk.STOCK_UNDO,
              _("_Undo"),
              "<Ctrl>Z", _("Undo the last operation"), self._undoCb),
@@ -279,7 +279,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
             ("Quit", gtk.STOCK_QUIT, None, None, None, self._quitCb),
             ("About", gtk.STOCK_ABOUT, None, None,
              _("Information about %s") % APPNAME, self._aboutCb),
-            ("UserManual", gtk.STOCK_HELP, _("User manual"),
+            ("UserManual", gtk.STOCK_HELP, _("User Manual"),
              None, None, self._userManualCb),
             ("File", None, _("_File")),
             ("Edit", None, _("_Edit")),
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index f34c32c..600dfdc 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -135,7 +135,7 @@ class SourceList(gtk.VBox, Loggable):
 
         # Popup Menu
         self.popup = gtk.Menu()
-        self.popup_importitem = gtk.ImageMenuItem(_("Import clips..."))
+        self.popup_importitem = gtk.ImageMenuItem(_("Import Files..."))
         image = gtk.Image()
         image.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_MENU)
         self.popup_importitem.set_image(image)
@@ -239,8 +239,8 @@ class SourceList(gtk.VBox, Loggable):
         txtlabel.set_line_wrap_mode(pango.WRAP_WORD)
         txtlabel.set_justify(gtk.JUSTIFY_CENTER)
         txtlabel.set_text(
-            _('Add media to your project by dragging files here or '
-              'by using the "Import clips..." button.'))
+            _('Add media to your project by dragging files and folders here or '
+              'by using the "Import Files..." button.'))
         self.infobar.add(txtlabel)
         self.txtlabel = txtlabel
 
@@ -307,20 +307,22 @@ class SourceList(gtk.VBox, Loggable):
 
         # always available
         actions = (
-            ("ImportSources", gtk.STOCK_ADD, _("_Import clips..."),
-                None, _("Import clips to use"), self._importSourcesCb),
+            ("ImportSources", gtk.STOCK_ADD, _("_Import Files..."),
+                None, _("Add media files to your project"),
+                self._importSourcesCb),
             ("ImportSourcesFolder", gtk.STOCK_ADD,
-                _("Import _folder of clips..."), None,
-                _("Import folder of clips to use"), self._importSourcesFolderCb),
+                _("Import _Folders..."), None,
+                _("Add the contents of a folder as clips in your project"),
+                self._importSourcesFolderCb),
         )
 
         # only available when selection is non-empty
         selection_actions = (
             ("RemoveSources", gtk.STOCK_DELETE,
-                _("_Remove from project"), "<Control>Delete", None,
+                _("_Remove from Project"), "<Control>Delete", None,
                 self._removeSourcesCb),
             ("InsertEnd", gtk.STOCK_COPY,
-                _("Insert at _end of timeline"), "Insert", None,
+                _("Insert at _End of Timeline"), "Insert", None,
                 self._insertEndCb),
         )
 
@@ -506,10 +508,10 @@ class SourceList(gtk.VBox, Loggable):
 
         if select_folders:
             chooser_action = gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER
-            dialogtitle = _("Import a folder")
+            dialogtitle = _("Select One or More Folders")
         else:
             chooser_action = gtk.FILE_CHOOSER_ACTION_OPEN
-            dialogtitle = _("Import a clip")
+            dialogtitle = _("Select One or More Files")
         close_after = gtk.CheckButton(_("Close after importing files"))
         close_after.set_active(self.app.settings.closeImportDialog)
 
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 1fdcf07..f39d997 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -144,7 +144,7 @@ class InfoStub(gtk.HBox, Loggable):
         self.errors = []
         self.showing = False
         self._scroll_pos_ns = 0
-        self._errorsmessage = _("One or more GStreamer errors has occured!")
+        self._errorsmessage = _("One or more GStreamer errors occured!")
         self._makeUI()
 
     def _makeUI(self):
@@ -331,11 +331,11 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         self.playhead_actions = (
             ("Split", "pitivi-split", _("Split"), "S", SPLIT,
                 self.split),
-            ("Keyframe", "pitivi-keyframe", _("Add a keyframe"), "K", KEYFRAME,
+            ("Keyframe", "pitivi-keyframe", _("Add a Keyframe"), "K", KEYFRAME,
                 self.keyframe),
-            ("Prevframe", "pitivi-prevframe", _("_Previous keyframe"), "E", PREVFRAME,
+            ("Prevframe", "pitivi-prevframe", _("_Previous Keyframe"), "E", PREVFRAME,
                 self.prevframe),
-            ("Nextframe", "pitivi-nextframe", _("_Next keyframe"), "R", NEXTFRAME,
+            ("Nextframe", "pitivi-nextframe", _("_Next Keyframe"), "R", NEXTFRAME,
                 self.nextframe),
         )