[glib/gsettings: 70/70] Merge branch 'master' into gsettings
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gsettings: 70/70] Merge branch 'master' into gsettings
- Date: Fri, 4 Sep 2009 18:10:31 +0000 (UTC)
commit 355d447e29f2ed391a6e0021ad025df1a0a9ff8c
Merge: 539f8c8... 16ddefe...
Author: Ryan Lortie <desrt desrt ca>
Date: Fri Sep 4 14:08:38 2009 -0400
Merge branch 'master' into gsettings
Conflicts:
gio/giomodule.c
NEWS | 46 ++
acglib.m4 | 2 +-
configure.in | 4 +-
docs/reference/gio/gio-sections.txt | 6 +
docs/reference/glib/glib-sections.txt | 1 +
gio/gcancellable.c | 139 +++-
gio/gcancellable.h | 3 +-
gio/gfileinfo.c | 2 +
gio/ginetsocketaddress.c | 2 +-
gio/ginputstream.c | 2 +-
gio/gio.symbols | 1 +
gio/glocalfileinfo.c | 33 +-
gio/glocalfileoutputstream.c | 2 +-
gio/gnetworkingprivate.h | 4 +
gio/gresolver.c | 68 ++
gio/gresolver.h | 9 +-
gio/gsocket.c | 43 +-
gio/gsocketservice.c | 1 -
gio/gunixinputstream.c | 6 +-
gio/gunixoutputstream.c | 4 +-
gio/gunixresolver.c | 72 ++-
gio/tests/resolver.c | 3 +
gio/win32/gwinhttpfile.c | 16 +-
glib/gconvert.c | 22 +-
glib/gdir.c | 13 +-
glib/gerror.c | 5 +-
glib/grand.c | 1 +
glib/gspawn-win32.c | 9 +-
glib/gspawn.c | 27 +-
glib/gtimer.c | 18 +-
glib/gutils.h | 4 +-
po/am.po | 120 ++--
po/ar.po | 120 ++--
po/as.po | 1105 +++++++++++++++----------------
po/az.po | 120 ++--
po/be.po | 120 ++--
po/be latin po | 120 ++--
po/bg.po | 342 ++++------
po/bn.po | 120 ++--
po/bn_IN.po | 120 ++--
po/bs.po | 120 ++--
po/ca.po | 120 ++--
po/ca valencia po | 211 +++----
po/cs.po | 1141 +++++++++++++++-----------------
po/cy.po | 120 ++--
po/da.po | 287 ++++----
po/de.po | 1185 ++++++++++++++++----------------
po/dz.po | 120 ++--
po/el.po | 120 ++--
po/en_CA.po | 120 ++--
po/en_GB.po | 120 ++--
po/eo.po | 120 ++--
po/es.po | 921 +++++++++++++-------------
po/et.po | 124 ++--
po/eu.po | 160 +++--
po/fa.po | 120 ++--
po/fi.po | 473 +++++++-------
po/fr.po | 924 +++++++++++++-------------
po/ga.po | 921 +++++++++++++-------------
po/gl.po | 918 +++++++++++++-------------
po/gu.po | 352 ++++------
po/he.po | 120 ++--
po/hi.po | 358 ++++------
po/hr.po | 120 ++--
po/hu.po | 453 +++++--------
po/hy.po | 120 ++--
po/id.po | 120 ++--
po/is.po | 120 ++--
po/it.po | 193 +++---
po/ja.po | 295 ++++----
po/ka.po | 120 ++--
po/kn.po | 1188 +++++++++++++++------------------
po/ko.po | 323 +++++-----
po/ku.po | 120 ++--
po/lt.po | 120 ++--
po/lv.po | 120 ++--
po/mai.po | 120 ++--
po/mg.po | 120 ++--
po/mk.po | 120 ++--
po/ml.po | 1196 +++++++++++++++------------------
po/mn.po | 120 ++--
po/mr.po | 1187 +++++++++++++++------------------
po/ms.po | 120 ++--
po/nb.po | 132 ++--
po/ne.po | 120 ++--
po/nl.po | 120 ++--
po/nn.po | 120 ++--
po/oc.po | 120 ++--
po/or.po | 296 ++++-----
po/pa.po | 293 ++++-----
po/pl.po | 620 +++++++----------
po/ps.po | 120 ++--
po/pt.po | 1092 +++++++++++++++---------------
po/pt_BR.po | 1098 +++++++++++++++---------------
po/ro.po | 120 ++--
po/ru.po | 120 ++--
po/rw.po | 120 ++--
po/si.po | 120 ++--
po/sk.po | 120 ++--
po/sl.po | 120 ++--
po/sq.po | 120 ++--
po/sr.po | 120 ++--
po/sr ije po | 120 ++--
po/sr latin po | 120 ++--
po/sv.po | 374 ++++++-----
po/ta.po | 1178 +++++++++++++++-----------------
po/te.po | 1185 +++++++++++++++------------------
po/th.po | 120 ++--
po/tl.po | 120 ++--
po/tr.po | 1151 +++++++++++++++-----------------
po/tt.po | 120 ++--
po/uk.po | 120 ++--
po/vi.po | 120 ++--
po/wa.po | 120 ++--
po/xh.po | 120 ++--
po/yi.po | 120 ++--
po/zh_CN.po | 120 ++--
po/zh_HK.po | 936 +++++++++++++-------------
po/zh_TW.po | 921 +++++++++++++-------------
tests/testglib.c | 21 +
120 files changed, 14895 insertions(+), 15707 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
