commit a0b6270e802ea4342f365273106977a9ff2d09a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Dec 19 09:37:05 2013 +0100
3.11.3
NEWS | 22 ++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
commit 1e71da786fcbc2ff9f4aa026b2b1fa05a752b499
Merge: bd75afa 4ef07b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Dec 19 09:35:25 2013 +0100
Merge remote-tracking branch 'origin/gnome-3-10'
Conflicts:
NEWS
configure.ac
po/es.po
po/ta.po
po/te.po
po/zh_CN.po
commit 4ef07b0e1e7c5d67d34856f243063cc039086058
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date: Wed Dec 18 17:46:46 2013 +0530
Updated Telugu Translations
po/te.po | 3082
++++++++++++++++++++++++++++----------------------------------
1 file changed, 1385 insertions(+), 1697 deletions(-)
commit bd75afa700247fae45e2dcb6c1dd59db14f62d9f
Author: Krishnababu Krothapalli <kkrothap@redhat.com>
Date: Wed Dec 18 17:46:06 2013 +0530
Updated Telugu Translations
po/te.po | 3092
++++++++++++++++++++++++++++----------------------------------
1 file changed, 1390 insertions(+), 1702 deletions(-)
commit 84ff393a3d0a3e47af0c7c1bf39ba21337c6e18c
Author: Milo Casagrande <milo@ubuntu.com>
Date: Wed Dec 11 10:28:39 2013 +0100
[l10n] Updated Italian translation.
po/it.po | 386
+++++++++++++++++++++++++++++++--------------------------------
1 file changed, 189 insertions(+), 197 deletions(-)
commit 0f827184d7c64b36ed1ea148c43bbb6adede673f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Mon Dec 9 16:02:26 2013 +0100
Updated Spanish translation
po/es.po | 241
+++++++++++++++++++++++++++++++--------------------------------
1 file changed, 120 insertions(+), 121 deletions(-)
commit f99af4b5fa0758618a7333e1f299bf921a11cefa
Author: A S Alam <apreet.alam@gmail.com>
Date: Sat Dec 7 19:15:42 2013 -0600
Update Punjabi Translation by Alam
po/pa.po | 819
+++++++++++++++++++++++++++++++++------------------------------
1 file changed, 424 insertions(+), 395 deletions(-)
commit 33a577e5fb206ad24c2f919fd2b18934989cf865
Author: 甘露(Gan Lu) <rhythm.gan@gmail.com>
Date: Sat Dec 7 14:27:13 2013 +0800
Update Chinese simplified translation
po/zh_CN.po | 2700
+++++++++++++++++++++++++++--------------------------------
1 file changed, 1217 insertions(+), 1483 deletions(-)
commit fd3e5983011ce2522aa27a75057f31162e59cb6e
Author: Wylmer Wang <wantinghard@gmail.com>
Date: Sat Dec 7 14:25:55 2013 +0800
Update Chinese simplified translation
po/zh_CN.po | 2681
+++++++++++++++++++++++++++--------------------------------
1 file changed, 1207 insertions(+), 1474 deletions(-)
commit b7f620fff4aa8933eb7a35a2959746f652964767
Author: Will Thompson <will@willthompson.co.uk>
Date: Tue Oct 8 08:22:33 2013 +0100
Roster: use the plural for "any contacts"
In the context of “You haven't added any contact yet”,
“contact” should
be plural. This patch fixes the LANG=C string; translators can
do their
thing.
https://bugzilla.gnome.org/show_bug.cgi?id=709611
src/empathy-roster-window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 96f2a474e0cdc5f8fe8a482d14a1a97c519def3a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Thu Nov 21 18:09:16 2013 +0000
libempathy: Remove empathy_create_individual_from_tp_contact()
It has been replaced by empathy_ensure_individual_from_tp_contact(),
which can’t cause internal state corruption in libfolks by
wrapping an
existing Persona in a second Individual when it’s already wrapped in
one.
This has also been fixed in libfolks.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1031252
https://bugzilla.gnome.org/show_bug.cgi?id=712839
libempathy-gtk/empathy-contact-chooser.c | 2 +-
libempathy-gtk/empathy-individual-menu.c | 2 +-
libempathy-gtk/empathy-individual-store-channel.c | 2 +-
libempathy/empathy-utils.c | 20
--------------------
libempathy/empathy-utils.h | 3 ---
5 files changed, 3 insertions(+), 26 deletions(-)
commit 0909d1f884c4542553d98b18e7622664d2a02169
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Thu Nov 21 18:09:16 2013 +0000
libempathy: Remove empathy_create_individual_from_tp_contact()
It has been replaced by empathy_ensure_individual_from_tp_contact(),
which can’t cause internal state corruption in libfolks by
wrapping an
existing Persona in a second Individual when it’s already wrapped in
one.
This has also been fixed in libfolks.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1031252
https://bugzilla.gnome.org/show_bug.cgi?id=712839
libempathy-gtk/empathy-contact-chooser.c | 2 +-
libempathy-gtk/empathy-individual-menu.c | 2 +-
libempathy-gtk/empathy-individual-store-channel.c | 2 +-
libempathy/empathy-utils.c | 20
--------------------
libempathy/empathy-utils.h | 3 ---
5 files changed, 3 insertions(+), 26 deletions(-)
commit 561774b13b402c3f33b5264efc5abd091aa563cf
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date: Sat Nov 23 00:14:31 2013 +0200
Updated Greek translation
help/el/el.po | 2466
++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 1497 insertions(+), 969 deletions(-)
commit 8defe68d6698b61146f4c91aa7fed82babc5a868
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed Nov 20 13:15:07 2013 +0100
Updated Spanish translation
po/es.po | 108
+++++++++++++++++++++++++++++++--------------------------------
1 file changed, 54 insertions(+), 54 deletions(-)
commit e0d7b54019ebbea8e8f751b92801e7c4c2a2dc1c
Author: Shantha kumar <shkumar@redhat.com>
Date: Wed Nov 20 13:28:39 2013 +0530
Updated Tamil Translations
po/ta.po | 2904
+++++++++++++++++++++++++++++---------------------------------
1 file changed, 1335 insertions(+), 1569 deletions(-)
commit 684cd7457b2f0f31ee6eed6835834864621158b4
Author: Shantha kumar <shkumar@redhat.com>
Date: Wed Nov 20 13:23:49 2013 +0530
Updated Tamil Translations
po/ta.po | 2907
+++++++++++++++++++++++++++++---------------------------------
1 file changed, 1335 insertions(+), 1572 deletions(-)
commit 25b40bf1b21a7c73a5b87649e3fb3536d64d0a97
Author: Veena Katiyar <veenakatiyar0509@gmail.com>
Date: Mon Nov 18 00:39:18 2013 +0530
Insert smileys at the cursor position
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=685899
libempathy-gtk/empathy-chat.c | 15 ++++++++-------
libempathy-gtk/empathy-chat.h | 3 +++
src/empathy-chat-window.c | 7 ++-----
3 files changed, 13 insertions(+), 12 deletions(-)
commit 7f44d7db80e54db89d38eef093799aaa2eef978a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Nov 11 11:06:11 2013 +0100
remove released flag
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 29be6a50139382fd52ab5261cd130d67fe26fcc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Nov 11 11:01:31 2013 +0100
3.10.2
NEWS | 34 ++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 36 insertions(+), 2 deletions(-)
commit d9518854b285b88e53f6d8fd96582e7e88b80be3
Author: Benjamin Steinwender <b@stbe.at>
Date: Mon Nov 4 18:38:14 2013 +0100
Updated German translation
po/de.po | 792
+++++++++++++++++++++++++++++++++------------------------------
1 file changed, 412 insertions(+), 380 deletions(-)
commit 8b783df8f293a93405b591522f5289006286f1f4
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Thu Oct 31 13:39:21 2013 -0400
SASL: fix facebook mechanism
libsoup was escaping '_' and '.' in the challenge response but the
facebook server is not expecting that.
https://bugzilla.gnome.org/show_bug.cgi?id=707747
libempathy/empathy-sasl-mechanisms.c | 33
+++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
commit 31e04cc0ac313d270b96188338ef8c9d2004acc7
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Thu Oct 31 13:39:21 2013 -0400
SASL: fix facebook mechanism
libsoup was escaping '_' and '.' in the challenge response but the
facebook server is not expecting that.
https://bugzilla.gnome.org/show_bug.cgi?id=707747
libempathy/empathy-sasl-mechanisms.c | 33
+++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
commit 46f82b56bd2902de606c9827a0f59bc5d1afb6fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Oct 31 10:56:12 2013 +0100
remove test.{manager,profile}
They are not used since a while.
tests/Makefile.am | 4 ----
tests/test.manager | 5 -----
tests/test.profile | 4 ----
3 files changed, 13 deletions(-)
commit 3b6db195f7c07c8cc0a7cbf32fa276cdc9bb1a19
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Oct 31 16:45:56 2013 +0100
release.py: update last_tag_pattern
release.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 46bb87f715bad480e13eab36b8530d77665291a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Oct 31 16:45:42 2013 +0100
remove released flag
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)