/pidgin/main: f4c32aca3f1f: Merge the release-2.x.y branch into ...
Mark Doliner
mark at kingant.net
Sun Apr 5 16:45:24 EDT 2015
Changeset: f4c32aca3f1ff327f971602b47d9c19bedb38ab1
Author: Mark Doliner <mark at kingant.net>
Date: 2015-04-05 13:45 -0700
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/f4c32aca3f1f
Description:
Merge the release-2.x.y branch into master.
This was kind of a pain. As far as I can tell all the media changes that
happened in release-2.x.y were backported from master with one exception.
So I ignored all those changes from release-2.x.y and left the code in
master unchanged.
The exception is a0906e7a6bae from Jakub Adam, "Implement media encryption"
This still needs to happen in master. I didn't want to do it in this merge
because this merge was already kinda big and it seemed safer to do it
in a separate commit.
One other note:
$(GSTVIDEO_LIBS) was added to libfinch_la_LIBADD in finch/Makefile.am in
release-2.x.y in commit 2415067473ba. Is that correct? It seems weird
for finch to link against gstreamer video libraries since Finch has a
text UI.
diffstat:
configure.ac | 2 +-
finch/Makefile.am | 1 +
libpurple/example/Makefile.am | 1 +
pidgin/gtkdialogs.c | 7 +-
pidgin/gtkmedia.c | 5 +-
po/br.po | 20003 ++++++++++++++++++++++++
po/hy.po | 20004 +++++++++++++++++++++++++
po/ms_MY.po | 19975 ++++++++++++++++++++++++
share/ca-certs/Certum_Root_CA.pem | 19 +
share/ca-certs/Certum_Trusted_Network_CA.pem | 22 +
share/ca-certs/Makefile.am | 2 +
11 files changed, 60036 insertions(+), 5 deletions(-)
diffs (truncated from 60156 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -449,7 +449,7 @@ if test x$enable_i18n = xyes; then
GETTEXT_PACKAGE=pidgin
AC_SUBST(GETTEXT_PACKAGE)
- ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku ku_IQ lt lv mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr tt uk ur vi xh zh_CN zh_HK zh_TW"
+ ALL_LINGUAS="af am ar as ast az be at latin bg bn_IN bn br brx bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr at latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
diff --git a/finch/Makefile.am b/finch/Makefile.am
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -81,6 +81,7 @@ libfinch_la_LIBADD = \
$(LIBXML_LIBS) \
$(GNT_LIBS) \
$(GSTREAMER_LIBS) \
+ $(GSTVIDEO_LIBS) \
./libgnt/libgnt.la \
$(top_builddir)/libpurple/libpurple.la
diff --git a/libpurple/example/Makefile.am b/libpurple/example/Makefile.am
--- a/libpurple/example/Makefile.am
+++ b/libpurple/example/Makefile.am
@@ -8,6 +8,7 @@ nullclient_LDADD = \
$(INTLLIBS) \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
+ $(GSTVIDEO_LIBS) \
$(top_builddir)/libpurple/libpurple.la
AM_CPPFLAGS = \
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -161,6 +161,7 @@ static const struct translator translato
{NULL, NULL, "Israt Jahan", "israt at ankur.org.bd"},
{NULL, NULL, "Samia Nimatullah", "mailsamia2001 at yahoo.com"},
{N_("Bengali-India"), "bn_IN", "Runa Bhattacharjee", "runab at fedoraproject.org"},
+ {N_("Breton"), "br", "Gwenn Meynier", "tornoz at laposte.net"},
{N_("Bodo"), "brx", "Chandrakant Dhutadmal", "cpdhutadmal at yahoo.com"},
{N_("Bosnian"), "bs", "Lejla Hadzialic", "lejlah at gmail.com"},
{N_("Catalan"), "ca", "Josep Puigdemont", "josep.puigdemont at gmail.com"},
@@ -186,7 +187,6 @@ static const struct translator translato
{NULL, NULL, "Roozbeh Pournader", "roozbeh at farsiweb.info"},
{NULL, NULL, "Meelad Zakaria", "meelad at farsiweb.info"},
{N_("Finnish"), "fi", "Timo Jyrinki", "timo.jyrinki at iki.fi"},
- {N_("French"), "fr", "Éric Boumaour", "zongo_fr at users.sourceforge.net"},
{N_("Irish"), "ga", "Aaron Kearns", "ajkearns6 at gmail.com"},
{N_("Irish"), "ga", "Kevin Scannell", NULL},
{N_("Galician"), "gl", "Mar Castro", "mariamarcp at gmail.com"},
@@ -222,9 +222,10 @@ static const struct translator translato
{N_("Malayalam"), "ml", "Ani Peter", "apeter at redhat.com"},
{N_("Mongolian"), "mn", "gooyo", NULL},
{N_("Marathi"), "mr", "Sandeep Shedmake", "sandeep.shedmake at gmail.com"},
+ {N_("Malay"), "ms_MY", "abuyop", "abuyop at gmail.com"},
{N_("Burmese"), "my_MM", "Thura Hlaing", "trhura at gmail.com"},
{N_("Bokmål Norwegian"), "nb", "Allan Nordhøy", "epost at anotheragency.no"},
- {N_("Nepali"), "ne", "Shyam Krishna Bal", NULL},
+ {N_("Nepali"), "ne", "Saroj Dhakal", "lotusnagarkot at gmail.com"},
{N_("Dutch, Flemish"), "nl", "Gideon van Melle", "translations at gvmelle.com"},
{N_("Norwegian Nynorsk"), "nn", "Yngve Spjeld Landro", "l10n at landro.net"},
{N_("Occitan"), "oc", "Cédric Valmary", "cvalmary at yahoo.fr"},
@@ -299,6 +300,7 @@ static const struct translator past_tran
{NULL, NULL, "Loïc Jeannin", NULL},
{NULL, NULL, "Stéphane Pontier", NULL},
{NULL, NULL, "Stéphane Wirtel", NULL},
+ {NULL, NULL, "Éric Boumaour", NULL},
{N_("Galician"), "gl", "Ignacio Casal Quinteiro", NULL},
{N_("Hebrew"), "he", "Pavel Bibergal", NULL},
{N_("Hindi"), "hi", "Ravishankar Shrivastava", NULL},
@@ -323,6 +325,7 @@ static const struct translator past_tran
{NULL, NULL, "Hallvard Glad", NULL},
{NULL, NULL, "Petter Johan Olsen", NULL},
{NULL, NULL, "Espen Stefansen", NULL},
+ {N_("Nepali"), "ne", "Shyam Krishna Bal", NULL},
{N_("Dutch, Flemish"), "nl", "Vincent van Adrighem", NULL},
{N_("Occitan"), "oc", "Yannig Marchegay", NULL},
{N_("Polish"), "pl", "Krzysztof Foltman", NULL},
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -793,8 +793,9 @@ static struct phone_label {
} phone_labels[] = {
{"<b>1</b>", NULL, '1'},
/* Translators note: These are the letters on the keys of a numeric
- keypad; translate according to §7.2.4 of
- http://www.etsi.org/deliver/etsi_es/202100_202199/202130/01.01.01_60/es_20213 */
+ keypad; translate according to the tables in §7 of ETSI ES 202 130:
+ http://webapp.etsi.org/WorkProgram/Report_WorkItem.asp?WKI_ID=11730
+ */
/* Letters on the '2' key of a numeric keypad */
{"<b>2</b>", N_("ABC"), '2'},
/* Letters on the '3' key of a numeric keypad */
diff --git a/po/br.po b/po/br.po
new file mode 100644
--- /dev/null
+++ b/po/br.po
@@ -0,0 +1,20003 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Pidgin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-18 09:57-0500\n"
+"PO-Revision-Date: 2012-02-20 18:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/pidgin/language/br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:66 ../finch/finch.c:335 ../finch/finch.c:364
+#: ../finch/finch.c:459
+msgid "Finch"
+msgstr ""
+
+#: ../finch/finch.c:247
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: ../finch/finch.c:249
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+" -c, --config=DIR use DIR for config files\n"
+" -d, --debug print debugging messages to stderr\n"
+" -h, --help display this help and exit\n"
+" -n, --nologin don't automatically login\n"
+" -v, --version display the current version and exit\n"
+msgstr ""
+
+#: ../finch/finch.c:362 ../pidgin/gtkmain.c:776
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#. the user did not fill in the captcha
+#: ../finch/gntaccount.c:128 ../finch/gntaccount.c:171
+#: ../finch/gntaccount.c:178 ../finch/gntaccount.c:558 ../finch/gntblist.c:647
+#: ../finch/gntblist.c:817 ../finch/gntplugin.c:198 ../finch/gntplugin.c:246
+#: ../finch/gntrequest.c:398 ../finch/gntstatus.c:303 ../finch/gntstatus.c:312
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/chat.c:812
+#: ../libpurple/protocols/jabber/chat.c:823
+#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jutil.c:710
+#: ../libpurple/protocols/mxit/login.c:526
+#: ../libpurple/protocols/mxit/protocol.c:2543
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc10/ops.c:1451
+#: ../pidgin/plugins/disco/xmppdisco.c:514
+#: ../pidgin/plugins/disco/xmppdisco.c:519
+msgid "Error"
+msgstr ""
+
+#: ../finch/gntaccount.c:129 ../finch/gntaccount.c:171
+#: ../finch/gntaccount.c:178
+msgid "Account was not modified"
+msgstr ""
+
+#: ../finch/gntaccount.c:129
+msgid "Account was not added"
+msgstr ""
+
+#: ../finch/gntaccount.c:130
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+#: ../finch/gntaccount.c:172
+msgid ""
+"The account's protocol cannot be changed while it is connected to the "
+"server."
+msgstr ""
+
+#: ../finch/gntaccount.c:179
+msgid ""
+"The account's username cannot be changed while it is connected to the "
+"server."
+msgstr ""
+
+#: ../finch/gntaccount.c:510
+msgid "New mail notifications"
+msgstr ""
+
+#: ../finch/gntaccount.c:520
+msgid "Remember password"
+msgstr ""
+
+#: ../finch/gntaccount.c:559
+msgid "There are no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:560
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+#: ../finch/gntaccount.c:570 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1583 ../pidgin/gtkblist.c:5127
+msgid "Modify Account"
+msgstr ""
+
+#: ../finch/gntaccount.c:570
+msgid "New Account"
+msgstr ""
+
+#: ../finch/gntaccount.c:596 ../pidgin/gtkft.c:651
+msgid "Protocol:"
+msgstr ""
+
+#: ../finch/gntaccount.c:604
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:288
+msgid "Username:"
+msgstr ""
+
+#: ../finch/gntaccount.c:617
+msgid "Password:"
+msgstr ""
+
+#: ../finch/gntaccount.c:627
+msgid "Alias:"
+msgstr ""
+
+#. Register checkbox
+#: ../finch/gntaccount.c:638
+msgid "Create this account on the server"
+msgstr ""
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:654 ../finch/gntaccount.c:718
+#: ../finch/gntaccount.c:1014 ../finch/gntblist.c:700 ../finch/gntblist.c:806
+#: ../finch/gntblist.c:854 ../finch/gntblist.c:1210 ../finch/gntblist.c:1449
+#: ../finch/gntblist.c:1583 ../finch/gntblist.c:2762 ../finch/gntblist.c:2813
+#: ../finch/gntblist.c:2887 ../finch/gntblist.c:2949 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
+#: ../finch/gntprefs.c:268 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1281
+#: ../libpurple/account.c:1644 ../libpurple/account.c:1679
+#: ../libpurple/conversation.c:1311 ../libpurple/conversation.c:2147
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:391 ../libpurple/protocols/gg/gg.c:456
+#: ../libpurple/protocols/jabber/buddy.c:681
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2263
+#: ../libpurple/protocols/jabber/chat.c:922
+#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:2566
+#: ../libpurple/protocols/jabber/jabber.c:3430
+#: ../libpurple/protocols/jabber/si.c:1580
+#: ../libpurple/protocols/jabber/usernick.c:83
+#: ../libpurple/protocols/jabber/xdata.c:404
+#: ../libpurple/protocols/msn/msn.c:452 ../libpurple/protocols/msn/msn.c:577
+#: ../libpurple/protocols/msn/msn.c:640 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:672 ../libpurple/protocols/msn/msn.c:689
+#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/mxit/actions.c:314
+#: ../libpurple/protocols/mxit/actions.c:412
+#: ../libpurple/protocols/mxit/login.c:365
+#: ../libpurple/protocols/mxit/login.c:711
+#: ../libpurple/protocols/myspace/user.c:826
+#: ../libpurple/protocols/myspace/user.c:887
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/peer.c:1066
+#: ../libpurple/protocols/sametime/sametime.c:3435
+#: ../libpurple/protocols/sametime/sametime.c:3521
+#: ../libpurple/protocols/sametime/sametime.c:5420
+#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/silc/buddy.c:459
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:622
+#: ../libpurple/protocols/silc/chat.c:756
+#: ../libpurple/protocols/silc/ops.c:1831
+#: ../libpurple/protocols/silc/silc.c:1063
+#: ../libpurple/protocols/silc/silc.c:1271
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
+#: ../libpurple/protocols/silc10/chat.c:600
More information about the Commits
mailing list