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

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

commit e5718b391186c54b1b5babf6003f35e5fbb2c2fa
Merge: 017776a b406c73
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Sun Mar 4 00:52:21 2012 +0100

    Merge branch 'master' into gnome-3
    
    Conflicts:
    	CMakeLists.txt
    	TODO

 CMakeLists.txt       |    2 +-
 INSTALL              |    2 +-
 TODO                 |   19 +--
 help/de/de.po        |  223 +++++++++++++++++-
 help/es/es.po        |  140 ++++++++++--
 help/fr/fr.po        |  229 +++++++++++++++++-
 po/de.po             |  406 +++++++++++++++++----------------
 po/sl.po             |  634 ++++++++++++++++++++++++++------------------------
 po/sr.po             |  550 +++++++++++++++++++++++---------------------
 po/sr latin po       |  550 +++++++++++++++++++++++---------------------
 src/document.vala    |   22 ++
 src/main_window.vala |   46 +++-
 vapi/glib.vapi       |    8 +
 13 files changed, 1736 insertions(+), 1095 deletions(-)
---
diff --cc CMakeLists.txt
index 13cc990,c483f61..2ff06c6
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -47,13 -47,13 +47,13 @@@ if (BUILD_VALA
  endif ()
  
  find_package (PkgConfig)
 -pkg_check_modules (GTK REQUIRED "gtk+-2.0 >= 2.16")
 -pkg_check_modules (GTKSOURCEVIEW REQUIRED "gtksourceview-2.0 >= 2.10")
 -pkg_check_modules (GTKSPELL REQUIRED "gtkspell-2.0")
 +pkg_check_modules (GTK REQUIRED "gtk+-3.0 >= 3.2")
 +pkg_check_modules (GTKSOURCEVIEW REQUIRED "gtksourceview-3.0")
 +#pkg_check_modules (GTKSPELL REQUIRED "gtkspell-2.0")
  pkg_check_modules (GEE REQUIRED "gee-1.0")
- pkg_check_modules (GIO REQUIRED "gio-2.0 >= 2.28")
+ pkg_check_modules (GIO REQUIRED "gio-2.0 >= 2.30")
 -pkg_check_modules (UNIQUE REQUIRED "unique-1.0")
 -pkg_check_modules (GDK-X11 REQUIRED "gdk-x11-2.0")
 +#pkg_check_modules (UNIQUE REQUIRED "unique-1.0")
 +pkg_check_modules (GDK-X11 REQUIRED "gdk-x11-3.0")
  pkg_check_modules (X11 REQUIRED "x11")
  
  if (WITH_GNOME)
diff --cc TODO
index 91e0ef3,7a98dfa..27d12fe
--- a/TODO
+++ b/TODO
@@@ -27,15 -11,10 +11,18 @@@ The TODO is more detailed, but focus mo
  	  but it would be nice. The problem is that it involves a lot of work,
  	  more than expected. See the branch gnome-3.
  
 +	- GtkBox -> GtkGrid
 +	- right click on document tab (the gray zone is ugly)
 +	- remove the border of toolbars
 +	- reduce some widgets sizes (some are too big)
 +	- use GtkApplication instead of Unique
 +	- test dev version of GtkSpell
 +	- replace gtk_source_completion_info_set_sizing()
 +
  - Improve completion:
+ 	- complete placeholders (\ref, \cite, ...)
+ 	  (take into account all *.tex, *.bib, ... files of the project)
+ 
  	- show details by default (now we have to click on the button to see
  	  the details)