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

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

commit 79550bd658f2fb681f066695b1b079164a0f3781
Merge: 5450f2f f2ee9b7
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Thu Mar 29 21:54:20 2012 +0200

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

 CMakeLists.txt       |    4 +-
 INSTALL              |    2 +-
 NEWS                 |   21 ++
 README               |    2 +-
 help/cs/cs.po        |  191 +++++++++++-
 po/lv.po             |  705 ++++++++++++++++++++--------------------
 po/nb.po             |  890 +++++++++++++++++++++++---------------------------
 src/document.vala    |    2 +-
 src/main_window.vala |    8 +-
 vapi/glib.vapi       |    8 -
 10 files changed, 986 insertions(+), 847 deletions(-)
---
diff --cc src/main_window.vala
index 3a6d9a6,d9d0137..793cd9c
--- a/src/main_window.vala
+++ b/src/main_window.vala
@@@ -1940,7 -1934,20 +1940,7 @@@ public class MainWindow : Windo
      {
          string comments =
              _("LaTeXila is an Integrated LaTeX Environment for the GNOME Desktop");
-         string copyright = "Copyright (C) 2009-2011 SÃbastien Wilmet";
+         string copyright = "Copyright (C) 2009-2012 SÃbastien Wilmet";
 -        string licence =
 -"""LaTeXila is free software: you can redistribute it and/or modify
 -it under the terms of the GNU General Public License as published by
 -the Free Software Foundation, either version 3 of the License, or
 -(at your option) any later version.
 -
 -LaTeXila is distributed in the hope that it will be useful,
 -but WITHOUT ANY WARRANTY; without even the implied warranty of
 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -GNU General Public License for more details.
 -
 -You should have received a copy of the GNU General Public License
 -along with LaTeXila.  If not, see <http://www.gnu.org/licenses/>.""";
  
          string website = "http://projects.gnome.org/latexila/";;