[pitivi: 20/65] Fix the naming and categorization of menus

[Thibault Saunier <tsaunier src gnome org>]

commit 28b7c80f3064a1156826f969434eb04c15966fbd
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Tue Jun 21 17:06:46 2011 -0400

    Fix the naming and categorization of menus

 data/ui/mainwindow.xml  |    8 +++++---
 pitivi/ui/mainwindow.py |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/data/ui/mainwindow.xml b/data/ui/mainwindow.xml
index 12c395d..f069141 100644
--- a/data/ui/mainwindow.xml
+++ b/data/ui/mainwindow.xml
@@ -7,11 +7,16 @@
       <menuitem action="SaveProjectAs" />
       <menuitem action="RevertToSavedProject" />
       <separator />
+      <menuitem action="RenderProject" />
+      <separator />
       <menuitem action="Quit" />
     </menu>
     <menu action="Edit">
       <menuitem action="Undo" />
       <menuitem action="Redo" />
+      <separator />
+      <menuitem action="ProjectSettings" />
+      <separator />
       <menuitem action="Preferences" />
     </menu>
     <menu action="View">
@@ -24,13 +29,10 @@
       <menuitem action="WindowizeViewer" />
     </menu>
     <menu action="Library">
-      <menuitem action="RenderProject" />
       <separator />
       <placeholder name="SourceList" />
       <separator />
       <placeholder name="Timeline" />
-      <separator />
-      <menuitem action="ProjectSettings" />
     </menu>
     <menu action="Timeline">
       <placeholder name="Timeline" />
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index affc194..f719a9f 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -281,10 +281,10 @@ class PitiviMainWindow(gtk.Window, Loggable):
              _("Information about %s") % APPNAME, self._aboutCb),
             ("UserManual", gtk.STOCK_HELP, _("User Manual"),
              None, None, self._userManualCb),
-            ("File", None, _("_File")),
+            ("File", None, _("_Project")),
             ("Edit", None, _("_Edit")),
             ("View", None, _("_View")),
-            ("Library", None, _("_Project")),
+            ("Library", None, _("_Library")),
             ("Timeline", None, _("_Timeline")),
             ("Viewer", None, _("Previe_w")),
             ("PlayPause", gtk.STOCK_MEDIA_PLAY, None, "space", PLAY,