[gnome-clocks/wip/geolocation: 39/40] Merge remote-tracking branch 'origin' into wip/geolocation

[Evgeny Bobkin <ebobkin src gnome org>]

commit a36be91b806376cb21845424bf5057c05a73b6b3
Merge: f102f36 33c5678
Author: Evgeny Bobkin <evgen ibqn gmail com>
Date:   Thu Sep 5 14:42:55 2013 +0200

    Merge remote-tracking branch 'origin' into wip/geolocation

 Makefile.am                                        |    9 +-
 NEWS                                               |    8 +
 configure.ac                                       |    5 +-
 data/appdata/gnome-clocks.appdata.xml              |   23 ++
 data/appdata/hi-res-category.png                   |  Bin 0 -> 244521 bytes
 ...a.xml.in => org.gnome.clocks.gschema.xml.in.in} |   10 +-
 data/ui/menu.ui                                    |    5 +
 data/ui/stopwatch.ui                               |    2 +-
 po/POTFILES.in                                     |    4 +-
 po/POTFILES.skip                                   |    1 +
 po/cs.po                                           |  126 +++++----
 po/es.po                                           |  140 +++++-----
 po/fi.po                                           |  176 +++++++-----
 po/fr.po                                           |   62 +++--
 po/gl.po                                           |  110 ++++----
 po/hu.po                                           |  179 +++++++-----
 po/id.po                                           |  172 ++++++------
 po/it.po                                           |  107 ++++----
 po/lt.po                                           |  120 ++++----
 po/nb.po                                           |  118 ++++----
 po/pl.po                                           |   70 +++--
 po/pt_BR.po                                        |  129 +++++----
 po/ru.po                                           |  156 +++++------
 po/sk.po                                           |  130 +++++----
 po/sl.po                                           |   62 +++--
 po/sr.po                                           |  189 +++++++------
 po/sr latin po                                     |  189 +++++++------
 po/tg.po                                           |  125 +++++----
 po/zh_HK.po                                        |   94 ++++---
 po/zh_TW.po                                        |   94 ++++---
 src/gweather-3.0.vapi                              |  292 --------------------
 src/utils.vala                                     |    2 +-
 src/widgets.vala                                   |   18 +-
 src/world.vala                                     |   20 +-
 34 files changed, 1448 insertions(+), 1499 deletions(-)
---
diff --cc Makefile.am
index 6c85fc0,3ce38e4..de228bb
--- a/Makefile.am
+++ b/Makefile.am
@@@ -86,12 -90,9 +90,13 @@@ AM_VALAFLAGS = 
        --vapidir=egg-list-box \
        --pkg gio-2.0 \
        --pkg gtk+-3.0 \
+       --pkg gweather-3.0 \
        --pkg libcanberra \
        --pkg libnotify \
 +      --pkg gio-2.0 \
 +      --pkg libsoup-2.4 \
 +      --pkg json-glib-1.0 \
 +      --thread \
        --gresources  $(top_srcdir)/data/gnome-clocks.gresource.xml
  
  bin_PROGRAMS = gnome-clocks
diff --cc configure.ac
index 6a2df26,e82639f..aedd1e1
--- a/configure.ac
+++ b/configure.ac
@@@ -53,11 -53,9 +53,11 @@@ PKG_CHECK_MODULES(CLOCKS, 
      glib-2.0 >= 2.36
      gtk+-3.0 >= 3.9.11
      libcanberra >= 0.30
-     gweather-3.0 >= 3.9.3
+     gweather-3.0 >= 3.9.91
      gnome-desktop-3.0 >= 3.7.90
      libnotify >= 0.7.0
 +    libsoup-2.4 >= 2.43.90
 +    json-glib-1.0 >= 0.16.1
  ])
  
  AC_CONFIG_FILES([