[gnome-sudoku/vala-port: 23/23] Merge branch 'master' into vala-port

[Michael Catanzaro <mcatanzaro src gnome org>]

commit c778534c191d18401ace6d90b37f6e495035ebaa
Merge: b460cae 926ad62
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Feb 9 12:35:25 2014 -0600

    Merge branch 'master' into vala-port
    
    Conflicts:
        configure.ac
        src/lib/defaults.py
        src/lib/gsudoku.py
        src/lib/main.py

 NEWS                             |    6 +
 configure.ac                     |    4 +-
 data/gnome-sudoku.appdata.xml.in |    1 +
 po/cs.po                         |  244 +-
 po/el.po                         |  135 +-
 po/es.po                         |  170 +-
 po/gl.po                         |  273 +-
 po/lt.po                         |  247 +-
 po/nb.po                         |  233 +-
 po/pt_BR.po                      |  276 +-
 po/zh_CN.po                      | 6810 ++++++++++++++++----------------------
 po/zh_HK.po                      |  251 +-
 po/zh_TW.po                      |  257 +-
 13 files changed, 4046 insertions(+), 4861 deletions(-)
---
diff --cc po/lt.po
index 06e3a90,d0c33ad..bb22b87
--- a/po/lt.po
+++ b/po/lt.po
@@@ -553,6 -620,7 +620,6 @@@ msgstr "Nepavyko įrašyti failo %(file
  msgid "Unable to mark game as finished."
  msgstr "Žaidimo nepavyko pažymėti kaip baigto."
  
- #: ../src/lib/saver.py:229 ../src/lib/saver.py:230
+ #: ../src/lib/saver.py:225 ../src/lib/saver.py:226
  msgid "Sudoku unable to mark game as finished."
  msgstr "Sudoku nepavyko pažymėti žaidimo kaip baigto."
 -