/pidgin/main: 2426c4660669: Merge release-2.x.y branch into defa...
Mark Doliner
mark at kingant.net
Thu Feb 6 02:55:19 EST 2014
Changeset: 2426c4660669ffaf9a665a84e3124221997132bd
Author: Mark Doliner <mark at kingant.net>
Date: 2014-02-05 23:55 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/2426c4660669
Description:
Merge release-2.x.y branch into default.
One manual merge in pidgin/gtkdialogs.c. Just some translators' names.
diffstat:
configure.ac | 2 +-
libpurple/dnssrv.c | 4 +-
libpurple/plugins/ssl/ssl-nss.c | 42 +
pidgin/gtkdialogs.c | 8 +-
po/kk.po | 19750 ++++++++++++++++++++++++++++++++++++++
5 files changed, 19800 insertions(+), 6 deletions(-)
diffs (truncated from 19886 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,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 hy id it ja ka km kn ko ku lo lt mai mhr mk mn mr ms_MY 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 uk ur vi xh zh_CN zh_HK zh_TW"
+ 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 hy id it ja ka kk km kn ko ku lo lt mai mhr mk mn mr ms_MY 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 uk ur 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/libpurple/dnssrv.c b/libpurple/dnssrv.c
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -743,7 +743,7 @@ purple_srv_resolve(PurpleAccount *accoun
proxy_type = purple_proxy_info_get_type(
purple_proxy_get_setup(account));
if (proxy_type == PURPLE_PROXY_TOR) {
- purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.");
+ purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.\n");
cb(NULL, 0, extradata);
return NULL;
}
@@ -863,7 +863,7 @@ PurpleSrvTxtQueryData *purple_txt_resolv
proxy_type = purple_proxy_info_get_type(
purple_proxy_get_setup(account));
if (proxy_type == PURPLE_PROXY_TOR) {
- purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.");
+ purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.\n");
cb(NULL, extradata);
return NULL;
}
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -266,6 +266,46 @@ ssl_nss_get_peer_certificates(PRFileDesc
return peer_certs;
}
+/*
+ * Ideally this information would be exposed to the UI somehow, but for now we
+ * just print it to the debug log
+ */
+static void
+printSecurityInfo(PRFileDesc *fd)
+{
+ SECStatus result;
+ SSLChannelInfo channel;
+ SSLCipherSuiteInfo suite;
+
+ result = SSL_GetChannelInfo(fd, &channel, sizeof channel);
+ if (result == SECSuccess && channel.length == sizeof channel
+ && channel.cipherSuite) {
+ result = SSL_GetCipherSuiteInfo(channel.cipherSuite,
+ &suite, sizeof suite);
+
+ if (result == SECSuccess) {
+ purple_debug_info("nss", "SSL version %d.%d using "
+ "%d-bit %s with %d-bit %s MAC\n"
+ "Server Auth: %d-bit %s, "
+ "Key Exchange: %d-bit %s, "
+ "Compression: %s\n"
+ "Cipher Suite Name: %s\n",
+ channel.protocolVersion >> 8,
+ channel.protocolVersion & 0xff,
+ suite.effectiveKeyBits,
+ suite.symCipherName,
+ suite.macBits,
+ suite.macAlgorithmName,
+ channel.authKeyBits,
+ suite.authAlgorithmName,
+ channel.keaKeyBits, suite.keaTypeName,
+ channel.compressionMethodName,
+ suite.cipherSuiteName);
+ }
+ }
+}
+
+
static void
ssl_nss_handshake_cb(gpointer data, int fd, PurpleInputCondition cond)
{
@@ -293,6 +333,8 @@ ssl_nss_handshake_cb(gpointer data, int
return;
}
+ printSecurityInfo(nss_data->in);
+
purple_input_remove(nss_data->handshake_handler);
nss_data->handshake_handler = 0;
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -171,8 +171,7 @@ static const struct translator translato
{N_("Valencian-Catalan"), "ca at valencia", "Toni Hermoso", "toniher at softcatala.org"},
{NULL, NULL, "Josep Puigdemont", "tradgnome at softcatala.org"},
{N_("Czech"), "cs", "David Vachulka", "david at konstrukce-cad.com"},
- {N_("Danish"), "da", "Peter Bach", "bach.peter at gmail.com"},
- {NULL, NULL, "Morten Brix Pedersen", "morten at wtf.dk"},
+ {N_("Danish"), "da", "Nicky Thomassen", "nicky at aptget.dk"},
{N_("German"), "de", "Björn Voigt", "bjoernv at arcor.de"},
{N_("Dzongkha"), "dz", "Norbu", "nor_den at hotmail.com"},
{NULL, NULL, "Jurmey Rabgay", "jur_gay at yahoo.com"},
@@ -192,7 +191,7 @@ static const struct translator translato
{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_("Irish"), "ga", "Kevin Scannell", NULL},
{N_("Galician"), "gl", "Mar Castro", "mariamarcp at gmail.com"},
{NULL, NULL, "Frco. Javier Rial", "fjrial at cesga.es"},
{N_("Gujarati"), "gu", "Ankit Patel", "ankit_patel at users.sf.net"},
@@ -207,6 +206,7 @@ static const struct translator translato
{N_("Italian"), "it", "Claudio Satriano", "satriano at gmail.com"},
{N_("Japanese"), "ja", "Takayuki Kusano", "AE5T-KSN at asahi-net.or.jp"},
{N_("Georgian"), "ka", N_("Ubuntu Georgian Translators"), "alexander.didebulidze at stusta.mhn.de"},
+ {N_("Kazakh"), "kk", "Baurzhan Muftakhidinov", "baurthefirst at gmail.com"},
{N_("Khmer"), "km", "Khoem Sokhem", "khoemsokhem at khmeros.info"},
{N_("Kannada"), "kn", N_("Kannada Translation team"), "translation at sampada.info"},
{N_("Korean"), "ko", "Sushizang", "sushizang at empal.com"},
@@ -277,6 +277,8 @@ static const struct translator past_tran
{NULL, NULL, "Robert Millan", NULL},
{N_("Czech"), "cs", "Honza Král", NULL},
{NULL, NULL, "Miloslav Trmac", "mitr at volny.cz"},
+ {N_("Danish"), "da", "Peter Bach", "bach.peter at gmail.com"},
+ {NULL, NULL, "Morten Brix Pedersen", "morten at wtf.dk"},
{N_("German"), "de", "Daniel Seifert", NULL},
{NULL, NULL, "Karsten Weiss", NULL},
{NULL, NULL, "Jochen Kemnade", "jochenkemnade at web.de"},
diff --git a/po/kk.po b/po/kk.po
new file mode 100644
--- /dev/null
+++ b/po/kk.po
@@ -0,0 +1,19750 @@
+# 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: 2014-02-02 00:46-0600\n"
+"PO-Revision-Date: 2014-02-03 07:25+0000\n"
+"Last-Translator: Richard Laager <rlaager at wiktel.com>\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/pidgin/language/kk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:66 ../finch/finch.c:336 ../finch/finch.c:365
+#: ../finch/finch.c:454
+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:363 ../pidgin/gtkmain.c:772
+#, 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:2352
+#: ../libpurple/protocols/jabber/jutil.c:708
+#: ../libpurple/protocols/mxit/login.c:526
+#: ../libpurple/protocols/mxit/protocol.c:2543
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1472
+#: ../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:1576 ../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:266 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1222
+#: ../libpurple/account.c:1585 ../libpurple/account.c:1620
+#: ../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:1467
More information about the Commits
mailing list