[latexila/gnome-3: 15/16] Merge branch 'master' into gnome-3

[SÃbastien Wilmet <swilmet src gnome org>]

commit 9cd277e31d88d4caf678feab20536f156bd6659d
Merge: 283ce99 f1d5404
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Sun Feb 5 23:50:39 2012 +0100

    Merge branch 'master' into gnome-3
    
    Conflicts:
    	src/structure.vala

 AUTHORS                             |   31 +++-
 CMakeLists.txt                      |    2 +-
 NEWS                                |   30 +++
 README                              |    2 +-
 data/org.gnome.latexila.gschema.xml |    4 -
 help/C/build_tools.page             |    2 +-
 help/C/completion.page              |   40 ++++
 help/C/projects.page                |   41 ++++
 help/C/spell_checking.page          |   49 +++++
 help/C/structure.page               |   45 ++++
 help/Makefile.am                    |    8 +-
 help/es/es.po                       |  119 ++++++++++-
 po/es.po                            |  386 ++++++++++++++++++-----------------
 src/build_view.vala                 |    4 -
 src/main_window.vala                |   23 +--
 src/structure.vala                  |   68 +++++--
 src/ui/ui.xml                       |    2 -
 17 files changed, 611 insertions(+), 245 deletions(-)
---
diff --cc src/structure.vala
index 8f1ae69,111a277..6732452
--- a/src/structure.vala
+++ b/src/structure.vala
@@@ -155,28 -155,28 +157,28 @@@ public class Structure : Gri
  
          // separator
          sep = new SeparatorToolItem ();
 -        hbox.pack_start (sep, false);
 +        grid.add (sep);
  
          // simple list buttons
-         ToggleButton toggle_button = create_simple_list_button ({ StructType.LABEL },
+         ToggleButton toggle_button = create_simple_list_button (StructType.LABEL,
              _("Show labels"));
 -        hbox.pack_start (toggle_button);
 +        grid.add (toggle_button);
  
-         toggle_button = create_simple_list_button ({ StructType.INCLUDE },
+         toggle_button = create_simple_list_button (StructType.INCLUDE,
              _("Show files included"));
 -        hbox.pack_start (toggle_button);
 +        grid.add (toggle_button);
  
-         toggle_button = create_simple_list_button ({ StructType.TABLE },
+         toggle_button = create_simple_list_button (StructType.TABLE,
              _("Show tables"));
 -        hbox.pack_start (toggle_button);
 +        grid.add (toggle_button);
  
-         toggle_button = create_simple_list_button (
-             { StructType.FIGURE, StructType.IMAGE }, _("Show figures and images"));
+         toggle_button = create_simple_list_button (StructType.FIGURE,
+             _("Show figures and images"));
 -        hbox.pack_start (toggle_button);
 +        grid.add (toggle_button);
  
-         toggle_button = create_simple_list_button ({ StructType.TODO, StructType.FIXME },
+         toggle_button = create_simple_list_button (StructType.TODO,
              _("Show TODOs and FIXMEs"));
 -        hbox.pack_start (toggle_button);
 +        grid.add (toggle_button);
      }
  
      // Only one button can be activated at the same time.